diff --git a/.travis.yml b/.travis.yml index eea291395..560c2a270 100644 --- a/.travis.yml +++ b/.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: diff --git a/2.7/jessie/onbuild/Dockerfile b/2.7/jessie/onbuild/Dockerfile deleted file mode 100644 index bd3a84cd5..000000000 --- a/2.7/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM python:2.7-jessie - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY requirements.txt /usr/src/app/ -ONBUILD RUN pip install --no-cache-dir -r requirements.txt - -ONBUILD COPY . /usr/src/app diff --git a/3.4/jessie/onbuild/Dockerfile b/3.4/jessie/onbuild/Dockerfile deleted file mode 100644 index e3e277030..000000000 --- a/3.4/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM python:3.4-jessie - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY requirements.txt /usr/src/app/ -ONBUILD RUN pip install --no-cache-dir -r requirements.txt - -ONBUILD COPY . /usr/src/app diff --git a/3.5/jessie/onbuild/Dockerfile b/3.5/jessie/onbuild/Dockerfile deleted file mode 100644 index 0bdfcfafc..000000000 --- a/3.5/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM python:3.5-jessie - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY requirements.txt /usr/src/app/ -ONBUILD RUN pip install --no-cache-dir -r requirements.txt - -ONBUILD COPY . /usr/src/app diff --git a/3.6/jessie/onbuild/Dockerfile b/3.6/jessie/onbuild/Dockerfile deleted file mode 100644 index eab31f7c8..000000000 --- a/3.6/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM python:3.6-jessie - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY requirements.txt /usr/src/app/ -ONBUILD RUN pip install --no-cache-dir -r requirements.txt - -ONBUILD COPY . /usr/src/app diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template deleted file mode 100644 index 2950ec194..000000000 --- a/Dockerfile-onbuild.template +++ /dev/null @@ -1,9 +0,0 @@ -FROM python:%%PLACEHOLDER%% - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY requirements.txt /usr/src/app/ -ONBUILD RUN pip install --no-cache-dir -r requirements.txt - -ONBUILD COPY . /usr/src/app diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index acdc083fe..b9aabde31 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -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]}" diff --git a/update.sh b/update.sh index 7f4616ccc..ba985a73a 100755 --- a/update.sh +++ b/update.sh @@ -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"