Skip to content

Commit 9fd50c0

Browse files
tianontianon
committed
Apply more bits from docker-library/golang#257 
1 parent 72f2e44 commit 9fd50c0

File tree

3 files changed

+82
-39
lines changed

3 files changed

+82
-39
lines changed

‎.travis.yml

+71-31
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,77 @@
11
language: bash
22
services: docker
33

4-
env:
5-
- VERSION=3.7 VARIANT=stretch
6-
- VERSION=3.7 VARIANT=stretch/slim
7-
- VERSION=3.7 VARIANT=alpine3.9
8-
- VERSION=3.7 VARIANT=alpine3.8
9-
- VERSION=3.6 VARIANT=stretch
10-
- VERSION=3.6 VARIANT=stretch/slim
11-
- VERSION=3.6 VARIANT=jessie
12-
- VERSION=3.6 VARIANT=jessie/slim
13-
- VERSION=3.6 VARIANT=alpine3.9
14-
- VERSION=3.6 VARIANT=alpine3.8
15-
- VERSION=3.5 VARIANT=stretch
16-
- VERSION=3.5 VARIANT=stretch/slim
17-
- VERSION=3.5 VARIANT=jessie
18-
- VERSION=3.5 VARIANT=jessie/slim
19-
- VERSION=3.5 VARIANT=alpine3.9
20-
- VERSION=3.5 VARIANT=alpine3.8
21-
- VERSION=3.4 VARIANT=stretch
22-
- VERSION=3.4 VARIANT=stretch/slim
23-
- VERSION=3.4 VARIANT=jessie
24-
- VERSION=3.4 VARIANT=jessie/slim
25-
- VERSION=3.4 VARIANT=wheezy
26-
- VERSION=3.4 VARIANT=alpine3.9
27-
- VERSION=3.4 VARIANT=alpine3.8
28-
- VERSION=2.7 VARIANT=stretch
29-
- VERSION=2.7 VARIANT=stretch/slim
30-
- VERSION=2.7 VARIANT=jessie
31-
- VERSION=2.7 VARIANT=jessie/slim
32-
- VERSION=2.7 VARIANT=wheezy
33-
- VERSION=2.7 VARIANT=alpine3.9
34-
- VERSION=2.7 VARIANT=alpine3.8
4+
matrix:
5+
include:
6+
- os: windows
7+
dist: 1803-containers
8+
env: VERSION=3.7 VARIANT=windows/windowsservercore-1803
9+
- os: linux
10+
env: VERSION=3.7 VARIANT=stretch
11+
- os: linux
12+
env: VERSION=3.7 VARIANT=stretch/slim
13+
- os: linux
14+
env: VERSION=3.7 VARIANT=alpine3.9
15+
- os: linux
16+
env: VERSION=3.7 VARIANT=alpine3.8
17+
- os: windows
18+
dist: 1803-containers
19+
env: VERSION=3.6 VARIANT=windows/windowsservercore-1803
20+
- os: linux
21+
env: VERSION=3.6 VARIANT=stretch
22+
- os: linux
23+
env: VERSION=3.6 VARIANT=stretch/slim
24+
- os: linux
25+
env: VERSION=3.6 VARIANT=jessie
26+
- os: linux
27+
env: VERSION=3.6 VARIANT=jessie/slim
28+
- os: linux
29+
env: VERSION=3.6 VARIANT=alpine3.9
30+
- os: linux
31+
env: VERSION=3.6 VARIANT=alpine3.8
32+
- os: linux
33+
env: VERSION=3.5 VARIANT=stretch
34+
- os: linux
35+
env: VERSION=3.5 VARIANT=stretch/slim
36+
- os: linux
37+
env: VERSION=3.5 VARIANT=jessie
38+
- os: linux
39+
env: VERSION=3.5 VARIANT=jessie/slim
40+
- os: linux
41+
env: VERSION=3.5 VARIANT=alpine3.9
42+
- os: linux
43+
env: VERSION=3.5 VARIANT=alpine3.8
44+
- os: linux
45+
env: VERSION=3.4 VARIANT=stretch
46+
- os: linux
47+
env: VERSION=3.4 VARIANT=stretch/slim
48+
- os: linux
49+
env: VERSION=3.4 VARIANT=jessie
50+
- os: linux
51+
env: VERSION=3.4 VARIANT=jessie/slim
52+
- os: linux
53+
env: VERSION=3.4 VARIANT=wheezy
54+
- os: linux
55+
env: VERSION=3.4 VARIANT=alpine3.9
56+
- os: linux
57+
env: VERSION=3.4 VARIANT=alpine3.8
58+
- os: windows
59+
dist: 1803-containers
60+
env: VERSION=2.7 VARIANT=windows/windowsservercore-1803
61+
- os: linux
62+
env: VERSION=2.7 VARIANT=stretch
63+
- os: linux
64+
env: VERSION=2.7 VARIANT=stretch/slim
65+
- os: linux
66+
env: VERSION=2.7 VARIANT=jessie
67+
- os: linux
68+
env: VERSION=2.7 VARIANT=jessie/slim
69+
- os: linux
70+
env: VERSION=2.7 VARIANT=wheezy
71+
- os: linux
72+
env: VERSION=2.7 VARIANT=alpine3.9
73+
- os: linux
74+
env: VERSION=2.7 VARIANT=alpine3.8
3575

3676
install:
3777
- git clone https://github.com/docker-library/official-images.git ~/official-images

‎generate-stackbrew-library.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ for version in "${versions[@]}"; do
7878
for v in \
7979
{stretch,jessie,wheezy}{,/slim} \
8080
alpine{3.9,3.8} \
81-
windows/windowsservercore-{ltsc2016,1709} \
82-
windows/nanoserver-{sac2016,1709} \
81+
windows/windowsservercore-{ltsc2016,1709,1803,1809} \
8382
; do
8483
dir="$version/$v"
8584
variant="$(basename "$v")"

‎update.sh

+10-6
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ for version in "${versions[@]}"; do
114114
for v in \
115115
alpine{3.8,3.9} \
116116
{wheezy,jessie,stretch}{/slim,} \
117-
windows/nanoserver-{1709,sac2016} \
118117
windows/windowsservercore-{1809,1803,1709,ltsc2016} \
119118
; do
120119
dir="$version/$v"
@@ -145,7 +144,7 @@ for version in "${versions[@]}"; do
145144
-e 's/^(ENV PYTHON_RELEASE) .*/\1 '"${fullVersion%%[a-z]*}"'/' \
146145
-e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/' \
147146
-e 's/^(FROM python):.*/\1:'"$version-$tag"'/' \
148-
-e 's!^(FROM (debian|buildpack-deps|alpine|[^/]+/windows/[^:]+)):.*!\1:'"$tag"'!' \
147+
-e 's!^(FROM (debian|buildpack-deps|alpine|mcr[.]microsoft[.]com/[^:]+)):.*!\1:'"$tag"'!' \
149148
"$dir/Dockerfile"
150149

151150
case "$variant" in
@@ -198,19 +197,24 @@ for version in "${versions[@]}"; do
198197
esac
199198

200199
case "$v" in
201-
windows/*-1803) ;; # TODO
202-
windows/*-1709|windows/*-1809) ;; # no AppVeyor support for 1709 or 1809 yet: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
200+
windows/*-1803)
201+
travisEnv='\n - os: windows\n dist: 1803-containers\n env: VERSION='"$version VARIANT=$v$travisEnv"
202+
;;
203+
204+
windows/*-1709 | windows/*-1809) ;; # no AppVeyor support for 1709 or 1809 yet: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
205+
203206
windows/*)
204207
appveyorEnv='\n - version: '"$version"'\n variant: '"$variant$appveyorEnv"
205208
;;
209+
206210
*)
207-
travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv"
211+
travisEnv='\n - os: linux\n env: VERSION='"$version VARIANT=$v$travisEnv"
208212
;;
209213
esac
210214
done
211215
done
212216

213-
travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
217+
travis="$(awk -v 'RS=\n\n' '$1 == "matrix:" { $0 = "matrix:\n include:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
214218
echo "$travis" > .travis.yml
215219

216220
appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)"

0 commit comments

Comments
 (0)