Skip to content

Commit

Permalink
Finally remove onbuild completely
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Jul 20, 2018
1 parent ea4449a commit 81d1c7b
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 84 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions 2.7/jessie/onbuild/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions 3.4/jessie/onbuild/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions 3.5/jessie/onbuild/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions 3.6/jessie/onbuild/Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions Dockerfile-onbuild.template

This file was deleted.

14 changes: 2 additions & 12 deletions generate-stackbrew-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand All @@ -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
Expand All @@ -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]}"
Expand Down
5 changes: 2 additions & 3 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" ;;
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 81d1c7b

Please sign in to comment.