Skip to content

Commit 1fda969

Browse files
LaurentGoderreLaurentGoderre
committed
Added support for multiple slim versions of debian
1 parent 93e6c1d commit 1fda969

File tree

21 files changed

+354
-131
lines changed

21 files changed

+354
-131
lines changed

‎.travis.yml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ jobs:
120120
- NODE_VERSION: "10"
121121
- VARIANT: "jessie"
122122

123+
- stage: Build
124+
before_script: *auto_skip
125+
env:
126+
- NODE_VERSION: "10"
127+
- VARIANT: "jessie-slim"
128+
123129
- stage: Build
124130
before_script: *auto_skip
125131
env:
@@ -140,13 +146,13 @@ jobs:
140146
before_script: *auto_skip
141147
env:
142148
- NODE_VERSION: "10"
143-
- VARIANT: "slim"
149+
- VARIANT: "stretch"
144150

145151
- stage: Build
146152
before_script: *auto_skip
147153
env:
148154
- NODE_VERSION: "10"
149-
- VARIANT: "stretch"
155+
- VARIANT: "stretch-slim"
150156

151157
- stage: Build
152158
before_script: *auto_skip
@@ -168,20 +174,26 @@ jobs:
168174
before_script: *auto_skip
169175
env:
170176
- NODE_VERSION: "11"
171-
- VARIANT: "slim"
177+
- VARIANT: "stretch"
172178

173179
- stage: Build
174180
before_script: *auto_skip
175181
env:
176182
- NODE_VERSION: "11"
177-
- VARIANT: "stretch"
183+
- VARIANT: "stretch-slim"
178184

179185
- stage: Build
180186
before_script: *auto_skip
181187
env:
182188
- NODE_VERSION: "6"
183189
- VARIANT: "jessie"
184190

191+
- stage: Build
192+
before_script: *auto_skip
193+
env:
194+
- NODE_VERSION: "6"
195+
- VARIANT: "jessie-slim"
196+
185197
- stage: Build
186198
before_script: *auto_skip
187199
env:
@@ -208,20 +220,26 @@ jobs:
208220
before_script: *auto_skip
209221
env:
210222
- NODE_VERSION: "6"
211-
- VARIANT: "slim"
223+
- VARIANT: "stretch"
212224

213225
- stage: Build
214226
before_script: *auto_skip
215227
env:
216228
- NODE_VERSION: "6"
217-
- VARIANT: "stretch"
229+
- VARIANT: "stretch-slim"
218230

219231
- stage: Build
220232
before_script: *auto_skip
221233
env:
222234
- NODE_VERSION: "8"
223235
- VARIANT: "jessie"
224236

237+
- stage: Build
238+
before_script: *auto_skip
239+
env:
240+
- NODE_VERSION: "8"
241+
- VARIANT: "jessie-slim"
242+
225243
- stage: Build
226244
before_script: *auto_skip
227245
env:
@@ -248,13 +266,13 @@ jobs:
248266
before_script: *auto_skip
249267
env:
250268
- NODE_VERSION: "8"
251-
- VARIANT: "slim"
269+
- VARIANT: "stretch"
252270

253271
- stage: Build
254272
before_script: *auto_skip
255273
env:
256274
- NODE_VERSION: "8"
257-
- VARIANT: "stretch"
275+
- VARIANT: "stretch-slim"
258276

259277
- stage: Build
260278
before_script: *auto_skip

‎10/architectures‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
bashbrew-arch variants
22
arm32v6 alpine
3-
arm32v7 jessie,onbuild,slim,stretch
3+
arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim
44
arm64v8 alpine,onbuild,stretch
5-
amd64 jessie,alpine,onbuild,slim,stretch
5+
amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim
66
i386 alpine
77
ppc64le alpine,onbuild,stretch
88
s390x alpine,onbuild,stretch

10/slim/Dockerfile renamed to 10/jessie-slim/Dockerfile

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,6 @@ FROM debian:jessie-slim
33
RUN groupadd --gid 1000 node \
44
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
55

6-
# gpg keys listed at https://github.com/nodejs/node#release-keys
7-
RUN set -ex \
8-
&& for key in \
9-
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
10-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
11-
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
12-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
13-
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
14-
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
16-
77984A986EBC2AA786BC0F66B01FBB92821C587A \
17-
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
18-
; do \
19-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
20-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
21-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
246
ENV NODE_VERSION 10.13.0
257

268
RUN buildDeps='xz-utils' \
@@ -34,9 +16,24 @@ RUN buildDeps='xz-utils' \
3416
i386) ARCH='x86';; \
3517
*) echo "unsupported architecture"; exit 1 ;; \
3618
esac \
37-
&& set -x \
38-
&& apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \
19+
&& set -ex \
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \
3921
&& rm -rf /var/lib/apt/lists/* \
22+
&& for key in \
23+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
24+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
25+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
27+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
28+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
29+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
30+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
31+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
32+
; do \
33+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
34+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
35+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
36+
done \
4037
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4138
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4239
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎10/jessie/Dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ FROM buildpack-deps:jessie
33
RUN groupadd --gid 1000 node \
44
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
55

6-
# gpg keys listed at https://github.com/nodejs/node#release-keys
7-
RUN set -ex \
6+
ENV NODE_VERSION 10.13.0
7+
8+
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
9+
&& case "${dpkgArch##*-}" in \
10+
amd64) ARCH='x64';; \
11+
ppc64el) ARCH='ppc64le';; \
12+
s390x) ARCH='s390x';; \
13+
arm64) ARCH='arm64';; \
14+
armhf) ARCH='armv7l';; \
15+
i386) ARCH='x86';; \
16+
*) echo "unsupported architecture"; exit 1 ;; \
17+
esac \
18+
# gpg keys listed at https://github.com/nodejs/node#release-keys
19+
&& set -ex \
820
&& for key in \
921
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1022
FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -19,20 +31,7 @@ RUN set -ex \
1931
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
2032
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
2133
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
24-
ENV NODE_VERSION 10.13.0
25-
26-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
27-
&& case "${dpkgArch##*-}" in \
28-
amd64) ARCH='x64';; \
29-
ppc64el) ARCH='ppc64le';; \
30-
s390x) ARCH='s390x';; \
31-
arm64) ARCH='arm64';; \
32-
armhf) ARCH='armv7l';; \
33-
i386) ARCH='x86';; \
34-
*) echo "unsupported architecture"; exit 1 ;; \
35-
esac \
34+
done \
3635
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3736
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3837
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎10/stretch-slim/Dockerfile‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
FROM debian:stretch-slim
2+
3+
RUN groupadd --gid 1000 node \
4+
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
5+
6+
ENV NODE_VERSION 10.13.0
7+
8+
RUN buildDeps='xz-utils' \
9+
&& ARCH= && dpkgArch="$(dpkg --print-architecture)" \
10+
&& case "${dpkgArch##*-}" in \
11+
amd64) ARCH='x64';; \
12+
ppc64el) ARCH='ppc64le';; \
13+
s390x) ARCH='s390x';; \
14+
arm64) ARCH='arm64';; \
15+
armhf) ARCH='armv7l';; \
16+
i386) ARCH='x86';; \
17+
*) echo "unsupported architecture"; exit 1 ;; \
18+
esac \
19+
&& set -ex \
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \
21+
&& rm -rf /var/lib/apt/lists/* \
22+
&& for key in \
23+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
24+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
25+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
27+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
28+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
29+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
30+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
31+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
32+
; do \
33+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
34+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
35+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
36+
done \
37+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
38+
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
39+
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
40+
&& grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
41+
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
42+
&& rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
43+
&& apt-get purge -y --auto-remove $buildDeps \
44+
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs
45+
46+
ENV YARN_VERSION 1.10.1
47+
48+
RUN set -ex \
49+
&& for key in \
50+
6A010C5166006599AA17F08146C2130DFD2497F5 \
51+
; do \
52+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
53+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
54+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
55+
done \
56+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
57+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
58+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
59+
&& mkdir -p /opt \
60+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
61+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
62+
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
63+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
64+
65+
CMD [ "node" ]

‎10/stretch/Dockerfile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@ FROM buildpack-deps:stretch
33
RUN groupadd --gid 1000 node \
44
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
55

6-
# gpg keys listed at https://github.com/nodejs/node#release-keys
7-
RUN set -ex \
6+
ENV NODE_VERSION 10.13.0
7+
8+
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
9+
&& case "${dpkgArch##*-}" in \
10+
amd64) ARCH='x64';; \
11+
ppc64el) ARCH='ppc64le';; \
12+
s390x) ARCH='s390x';; \
13+
arm64) ARCH='arm64';; \
14+
armhf) ARCH='armv7l';; \
15+
i386) ARCH='x86';; \
16+
*) echo "unsupported architecture"; exit 1 ;; \
17+
esac \
18+
# gpg keys listed at https://github.com/nodejs/node#release-keys
19+
&& set -ex \
820
&& for key in \
921
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
1022
FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -19,20 +31,7 @@ RUN set -ex \
1931
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
2032
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
2133
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
24-
ENV NODE_VERSION 10.13.0
25-
26-
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
27-
&& case "${dpkgArch##*-}" in \
28-
amd64) ARCH='x64';; \
29-
ppc64el) ARCH='ppc64le';; \
30-
s390x) ARCH='s390x';; \
31-
arm64) ARCH='arm64';; \
32-
armhf) ARCH='armv7l';; \
33-
i386) ARCH='x86';; \
34-
*) echo "unsupported architecture"; exit 1 ;; \
35-
esac \
34+
done \
3635
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3736
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3837
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

11/slim/Dockerfile renamed to 11/stretch-slim/Dockerfile

File renamed without changes.

‎6/architectures‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bashbrew-arch variants
2-
arm32v7 jessie,onbuild,slim,stretch
2+
arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim
33
arm64v8 stretch
4-
amd64 jessie,alpine,onbuild,slim,stretch
5-
i386 jessie,onbuild,slim,stretch
4+
amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim
5+
i386 jessie,jessie-slim,onbuild,stretch,stretch-slim
66
ppc64le stretch
77
s390x stretch

6/slim/Dockerfile renamed to 6/jessie-slim/Dockerfile

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,6 @@ FROM debian:jessie-slim
33
RUN groupadd --gid 1000 node \
44
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
55

6-
# gpg keys listed at https://github.com/nodejs/node#release-keys
7-
RUN set -ex \
8-
&& for key in \
9-
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
10-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
11-
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
12-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
13-
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
14-
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
16-
77984A986EBC2AA786BC0F66B01FBB92821C587A \
17-
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
18-
; do \
19-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
20-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
21-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
246
ENV NODE_VERSION 6.14.4
257

268
RUN buildDeps='xz-utils' \
@@ -34,9 +16,24 @@ RUN buildDeps='xz-utils' \
3416
i386) ARCH='x86';; \
3517
*) echo "unsupported architecture"; exit 1 ;; \
3618
esac \
37-
&& set -x \
38-
&& apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \
19+
&& set -ex \
20+
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \
3921
&& rm -rf /var/lib/apt/lists/* \
22+
&& for key in \
23+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
24+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
25+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
26+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
27+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
28+
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
29+
56730D5401028683275BD23C23EFEFE93C4CFFFE \
30+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
31+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
32+
; do \
33+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
34+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
35+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
36+
done \
4037
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4138
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4239
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

0 commit comments

Comments
 (0)