Skip to content

Commit 4c59289

Browse files
PeterDaveHelloPeterDaveHello
authored
Merge pull request #942 from LaurentGoderre/update-images
Updated image to reflect changes in the template
2 parents ed3e882 + fd2bad8 commit 4c59289

File tree

15 files changed

+122
-117
lines changed

15 files changed

+122
-117
lines changed

‎10/alpine/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \
2424
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
2525
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2626
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
27-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
2827
77984A986EBC2AA786BC0F66B01FBB92821C587A \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
3031
; do \
3132
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
3233
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \

‎10/jessie/Dockerfile‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ 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.14.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 \
1123
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
1224
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1325
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1426
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1627
77984A986EBC2AA786BC0F66B01FBB92821C587A \
1728
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
1831
; do \
1932
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
2033
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
2134
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
24-
ENV NODE_VERSION 10.14.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 \
35+
done \
3636
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3737
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3838
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎10/slim/Dockerfile‎

Lines changed: 18 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.14.0
257

268
RUN buildDeps='xz-utils' \
@@ -34,9 +16,25 @@ 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+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
30+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
31+
4ED778F539E3634C779C87C6D7062848A1AB005C \
32+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
33+
; do \
34+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
35+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
36+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
37+
done \
4038
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4139
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4240
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎10/stretch/Dockerfile‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ 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.14.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 \
1123
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
1224
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1325
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1426
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1627
77984A986EBC2AA786BC0F66B01FBB92821C587A \
1728
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
1831
; do \
1932
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
2033
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
2134
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
24-
ENV NODE_VERSION 10.14.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 \
35+
done \
3636
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3737
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3838
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎11/alpine/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \
2424
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
2525
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2626
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
27-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
2827
77984A986EBC2AA786BC0F66B01FBB92821C587A \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
3031
; do \
3132
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
3233
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \

‎11/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ RUN buildDeps='xz-utils' \
2626
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
2727
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2828
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
29-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3029
77984A986EBC2AA786BC0F66B01FBB92821C587A \
3130
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
31+
4ED778F539E3634C779C87C6D7062848A1AB005C \
32+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
3233
; do \
3334
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
3435
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \

‎11/stretch/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
2424
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
2525
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2626
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
27-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
2827
77984A986EBC2AA786BC0F66B01FBB92821C587A \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
3031
; do \
3132
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
3233
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \

‎6/alpine/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \
2424
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
2525
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2626
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
27-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
2827
77984A986EBC2AA786BC0F66B01FBB92821C587A \
2928
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
3031
; do \
3132
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
3233
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \

‎6/jessie/Dockerfile‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ 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 6.15.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 \
1123
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
1224
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1325
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1426
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
15-
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1627
77984A986EBC2AA786BC0F66B01FBB92821C587A \
1728
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
29+
4ED778F539E3634C779C87C6D7062848A1AB005C \
30+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
1831
; do \
1932
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
2033
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
2134
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
22-
done
23-
24-
ENV NODE_VERSION 6.15.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 \
35+
done \
3636
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3737
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
3838
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

‎6/slim/Dockerfile‎

Lines changed: 18 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.15.0
257

268
RUN buildDeps='xz-utils' \
@@ -34,9 +16,25 @@ 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+
77984A986EBC2AA786BC0F66B01FBB92821C587A \
30+
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
31+
4ED778F539E3634C779C87C6D7062848A1AB005C \
32+
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
33+
; do \
34+
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
35+
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
36+
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
37+
done \
4038
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4139
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
4240
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \

0 commit comments

Comments
 (0)