Skip to content

Commit 81d1c7b

Browse files
committed
Finally remove onbuild completely
1 parent ea4449a commit 81d1c7b

File tree

8 files changed

+4
-84
lines changed

8 files changed

+4
-84
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ script:
5151
set -x
5252
docker build -t "$image" .
5353
~/official-images/test/run.sh "$image"
54-
if [ -d onbuild ]; then
55-
onbuildFrom="$(awk 'toupper($1) == "FROM" { print $2; exit }' onbuild/Dockerfile)"
56-
docker tag "$image" "$onbuildFrom"
57-
docker build -t "$image-onbuild" onbuild
58-
~/official-images/test/run.sh "$image-onbuild"
59-
fi
6054
)
6155
6256
after_script:

2.7/jessie/onbuild/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

3.4/jessie/onbuild/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

3.5/jessie/onbuild/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

3.6/jessie/onbuild/Dockerfile

Lines changed: 0 additions & 15 deletions
This file was deleted.

Dockerfile-onbuild.template

Lines changed: 0 additions & 9 deletions
This file was deleted.

generate-stackbrew-library.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ for version in "${versions[@]}"; do
7676
rcVersion="${version%-rc}"
7777

7878
for v in \
79-
{stretch,jessie,wheezy}{,/slim,/onbuild} \
79+
{stretch,jessie,wheezy}{,/slim} \
8080
alpine{3.8,3.7,3.6} \
8181
windows/windowsservercore-{ltsc2016,1709} \
8282
windows/nanoserver-{sac2016,1709} \
@@ -94,13 +94,7 @@ for version in "${versions[@]}"; do
9494

9595
commit="$(dirCommit "$dir")"
9696

97-
versionDockerfile="$dir/Dockerfile"
98-
versionCommit="$commit"
99-
if [ "$variant" = 'onbuild' ]; then
100-
versionDockerfile="$(dirname "$dir")/Dockerfile"
101-
versionCommit="$(dirCommit "$(dirname "$versionDockerfile")")"
102-
fi
103-
fullVersion="$(git show "$versionCommit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "PYTHON_VERSION" { print $3; exit }')"
97+
fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "PYTHON_VERSION" { print $3; exit }')"
10498

10599
versionAliases=(
106100
$fullVersion
@@ -121,10 +115,6 @@ for version in "${versions[@]}"; do
121115

122116
case "$v" in
123117
windows/*) variantArches='windows-amd64' ;;
124-
*/onbuild)
125-
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$(dirname "$dir")/Dockerfile")"
126-
variantArches="${parentRepoToArches[$variantParent]}"
127-
;;
128118
*)
129119
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
130120
variantArches="${parentRepoToArches[$variantParent]}"

update.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ for version in "${versions[@]}"; do
113113

114114
for v in \
115115
alpine{3.6,3.7,3.8} \
116-
{wheezy,jessie,stretch}{/slim,/onbuild,} \
116+
{wheezy,jessie,stretch}{/slim,} \
117117
windows/nanoserver-{1709,sac2016} \
118118
windows/windowsservercore-{1709,ltsc2016} \
119119
; do
@@ -123,7 +123,7 @@ for version in "${versions[@]}"; do
123123
[ -d "$dir" ] || continue
124124

125125
case "$variant" in
126-
slim|onbuild) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;;
126+
slim) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;;
127127
windowsservercore-*) template='windowsservercore'; tag="${variant#*-}" ;;
128128
alpine*) template='alpine'; tag="${variant#alpine}" ;;
129129
*) template='debian'; tag="$variant" ;;
@@ -183,7 +183,6 @@ for version in "${versions[@]}"; do
183183
esac
184184

185185
case "$v" in
186-
*/onbuild) ;;
187186
windows/*-1709) ;; # no AppVeyor support for 1709 yet: https://github.com/appveyor/ci/issues/1885
188187
windows/*)
189188
appveyorEnv='\n - version: '"$version"'\n variant: '"$variant$appveyorEnv"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy