Merge pull request #314 from infosiftr/onbuild

Finally remove onbuild completely

Author: yosifkit

.travis.yml

@@ -51,12 +51,6 @@ script:
       set -x
       docker build -t "$image" .
       ~/official-images/test/run.sh "$image"
-      if [ -d onbuild ]; then
-        onbuildFrom="$(awk 'toupper($1) == "FROM" { print $2; exit }' onbuild/Dockerfile)"
-        docker tag "$image" "$onbuildFrom"
-        docker build -t "$image-onbuild" onbuild
-        ~/official-images/test/run.sh "$image-onbuild"
-      fi
     )
 
 after_script:

2.7/jessie/onbuild/Dockerfile

@@ -76,7 +76,7 @@ for version in "${versions[@]}"; do
 	rcVersion="${version%-rc}"
 
 	for v in \
-		{stretch,jessie,wheezy}{,/slim,/onbuild} \
+		{stretch,jessie,wheezy}{,/slim} \
 		alpine{3.8,3.7,3.6} \
 		windows/windowsservercore-{ltsc2016,1709} \
 		windows/nanoserver-{sac2016,1709} \
@@ -94,13 +94,7 @@ for version in "${versions[@]}"; do
 
 		commit="$(dirCommit "$dir")"
 
-		versionDockerfile="$dir/Dockerfile"
-		versionCommit="$commit"
-		if [ "$variant" = 'onbuild' ]; then
-			versionDockerfile="$(dirname "$dir")/Dockerfile"
-			versionCommit="$(dirCommit "$(dirname "$versionDockerfile")")"
-		fi
-		fullVersion="$(git show "$versionCommit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "PYTHON_VERSION" { print $3; exit }')"
+		fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "PYTHON_VERSION" { print $3; exit }')"
 
 		versionAliases=(
 			$fullVersion
@@ -121,10 +115,6 @@ for version in "${versions[@]}"; do
 
 		case "$v" in
 			windows/*) variantArches='windows-amd64' ;;
-			*/onbuild)
-				variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$(dirname "$dir")/Dockerfile")"
-				variantArches="${parentRepoToArches[$variantParent]}"
-				;;
 			*)
 				variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
 				variantArches="${parentRepoToArches[$variantParent]}"

3.4/jessie/onbuild/Dockerfile

@@ -113,7 +113,7 @@ for version in "${versions[@]}"; do
 
 	for v in \
 		alpine{3.6,3.7,3.8} \
-		{wheezy,jessie,stretch}{/slim,/onbuild,} \
+		{wheezy,jessie,stretch}{/slim,} \
 		windows/nanoserver-{1709,sac2016} \
 		windows/windowsservercore-{1709,ltsc2016} \
 	; do
@@ -123,7 +123,7 @@ for version in "${versions[@]}"; do
 		[ -d "$dir" ] || continue
 
 		case "$variant" in
-			slim|onbuild) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;;
+			slim) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;;
 			windowsservercore-*) template='windowsservercore'; tag="${variant#*-}" ;;
 			alpine*) template='alpine'; tag="${variant#alpine}" ;;
 			*) template='debian'; tag="$variant" ;;
@@ -183,7 +183,6 @@ for version in "${versions[@]}"; do
 		esac
 
 		case "$v" in
-			*/onbuild) ;;
 			windows/*-1709) ;; # no AppVeyor support for 1709 yet: https://github.com/appveyor/ci/issues/1885
 			windows/*)
 				appveyorEnv='\n    - version: '"$version"'\n      variant: '"$variant$appveyorEnv"