Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update node v11 to v11.2.0 with Yarn v1.12.3 #5079

Merged
merged 1 commit into from
Nov 19, 2018

Conversation

PeterDaveHello
Copy link
Contributor

Please note that this is not an automatically generated update as we want to keep some changes to be deployed in later future, so only update v11 manually here.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 7717543..dd1a9b3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -53,14 +53,14 @@ node:11
 node:11-alpine
 node:11-slim
 node:11-stretch
-node:11.1
-node:11.1-alpine
-node:11.1-slim
-node:11.1-stretch
-node:11.1.0
-node:11.1.0-alpine
-node:11.1.0-slim
-node:11.1.0-stretch
+node:11.2
+node:11.2-alpine
+node:11.2-slim
+node:11.2-stretch
+node:11.2.0
+node:11.2.0-alpine
+node:11.2.0-slim
+node:11.2.0-stretch
 node:alpine
 node:boron
 node:boron-alpine
diff --git a/node_alpine/Dockerfile b/node_alpine/Dockerfile
index 2632743..e144655 100644
--- a/node_alpine/Dockerfile
+++ b/node_alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.8
 
-ENV NODE_VERSION 11.1.0
+ENV NODE_VERSION 11.2.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -16,7 +16,7 @@ RUN addgroup -g 1000 node \
         linux-headers \
         make \
         python \
-  # gpg keys listed at https://github.com/nodejs/node#release-team
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \
     && rm -Rf "node-v$NODE_VERSION" \
     && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
 
-ENV YARN_VERSION 1.12.1
+ENV YARN_VERSION 1.12.3
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
diff --git a/node_latest/Dockerfile b/node_latest/Dockerfile
index 1e4a72f..f755150 100644
--- a/node_latest/Dockerfile
+++ b/node_latest/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:stretch
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 11.1.0
+ENV NODE_VERSION 11.2.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -15,7 +15,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     i386) ARCH='x86';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac \
-  # gpg keys listed at https://github.com/nodejs/node#release-team
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
   && set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.12.1
+ENV YARN_VERSION 1.12.3
 
 RUN set -ex \
   && for key in \
diff --git a/node_slim/Dockerfile b/node_slim/Dockerfile
index f84f2b7..e77b190 100644
--- a/node_slim/Dockerfile
+++ b/node_slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 11.1.0
+ENV NODE_VERSION 11.2.0
 
 RUN buildDeps='xz-utils' \
     && ARCH= && dpkgArch="$(dpkg --print-architecture)" \
@@ -43,7 +43,7 @@ RUN buildDeps='xz-utils' \
     && apt-get purge -y --auto-remove $buildDeps \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.12.1
+ENV YARN_VERSION 1.12.3
 
 RUN set -ex \
   && for key in \

@yosifkit
Copy link
Member

Delaying merge until build queue settles to minimize #3835 impact; see related #5082

@PeterDaveHello
Copy link
Contributor Author

@yosifkit thanks! May I update this PR to include the latest nodejs/docker-node#913 or you'd prefer a new PR for it?

@tianon
Copy link
Member

tianon commented Nov 19, 2018

This LGTM, let's do a separate PR for more. 👍

Build test of #5079; 50bbe84; amd64 (node):

$ bashbrew build node:8.12.0-jessie
Using bashbrew/cache:a00a63e77ed3afe46e18c63a4029e5d466c2d65e4e37815db493e5bffae852cb (node:8.12.0-jessie)
Tagging node:8.12.0-jessie
Tagging node:8.12-jessie
Tagging node:8-jessie
Tagging node:carbon-jessie
Tagging node:8.12.0
Tagging node:8.12
Tagging node:8
Tagging node:carbon

$ test/run.sh node:8.12.0-jessie
testing node:8.12.0-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.12.0-alpine
Using bashbrew/cache:1f3bbf8a0d21caed65fd15b95ba3f2b14621ce32a280d8abbe7b4eccc0dffa39 (node:8.12.0-alpine)
Tagging node:8.12.0-alpine
Tagging node:8.12-alpine
Tagging node:8-alpine
Tagging node:carbon-alpine

$ test/run.sh node:8.12.0-alpine
testing node:8.12.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.12.0-onbuild
Using bashbrew/cache:df36cb44e979aee0ed6b8f0247a5b1e810da360a7c7a9d259455c521b05f20e6 (node:8.12.0-onbuild)
Tagging node:8.12.0-onbuild
Tagging node:8.12-onbuild
Tagging node:8-onbuild
Tagging node:carbon-onbuild

$ test/run.sh node:8.12.0-onbuild
testing node:8.12.0-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build node:8.12.0-slim
Using bashbrew/cache:64be2389d452f0d386de8c2c149e7b52ed58ec732a1ad79ccab31eb7eb948ed4 (node:8.12.0-slim)
Tagging node:8.12.0-slim
Tagging node:8.12-slim
Tagging node:8-slim
Tagging node:carbon-slim

$ test/run.sh node:8.12.0-slim
testing node:8.12.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.12.0-stretch
Using bashbrew/cache:4c10a05cf15858426fc0c163b6fa61eb0022606977ad0cfe12c655f7b078f32d (node:8.12.0-stretch)
Tagging node:8.12.0-stretch
Tagging node:8.12-stretch
Tagging node:8-stretch
Tagging node:carbon-stretch

$ test/run.sh node:8.12.0-stretch
testing node:8.12.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-jessie
Using bashbrew/cache:3a5432381a0f1fe82385eca7e6072b1af4409af6f6b90c3bd2763f29d067227e (node:6.14.4-jessie)
Tagging node:6.14.4-jessie
Tagging node:6.14-jessie
Tagging node:6-jessie
Tagging node:boron-jessie
Tagging node:6.14.4
Tagging node:6.14
Tagging node:6
Tagging node:boron

$ test/run.sh node:6.14.4-jessie
testing node:6.14.4-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-alpine
Using bashbrew/cache:e1f6349e7dde65e5ea1fed65dc2c37c2d63d45cd71883006bdc16638bbb85253 (node:6.14.4-alpine)
Tagging node:6.14.4-alpine
Tagging node:6.14-alpine
Tagging node:6-alpine
Tagging node:boron-alpine

$ test/run.sh node:6.14.4-alpine
testing node:6.14.4-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-onbuild
Using bashbrew/cache:74b548a77c2f09fbb2113dd186f1c9cfa4e99b283d3a73b5f8665e877fd98f77 (node:6.14.4-onbuild)
Tagging node:6.14.4-onbuild
Tagging node:6.14-onbuild
Tagging node:6-onbuild
Tagging node:boron-onbuild

$ test/run.sh node:6.14.4-onbuild
testing node:6.14.4-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build node:6.14.4-slim
Using bashbrew/cache:eea02b504d1c830972e5bde7456ab54390221cb9a4ec8c110a7494d5fc1f819a (node:6.14.4-slim)
Tagging node:6.14.4-slim
Tagging node:6.14-slim
Tagging node:6-slim
Tagging node:boron-slim

$ test/run.sh node:6.14.4-slim
testing node:6.14.4-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-stretch
Using bashbrew/cache:28277676f7e9a830000bc5069863d93ff762c156e7addb0070526279a6fc93a2 (node:6.14.4-stretch)
Tagging node:6.14.4-stretch
Tagging node:6.14-stretch
Tagging node:6-stretch
Tagging node:boron-stretch

$ test/run.sh node:6.14.4-stretch
testing node:6.14.4-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-alpine
Using bashbrew/cache:8bc940590722a6ae40b13f0b193f7d0f6c635a9f7470128a62d4597a712a3b75 (node:11.2.0-alpine)
Tagging node:11.2.0-alpine
Tagging node:11.2-alpine
Tagging node:11-alpine
Tagging node:alpine

$ test/run.sh node:11.2.0-alpine
testing node:11.2.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-slim
Using bashbrew/cache:faf152673968814a8dc8ffac33e2a2c75c98a716638eca616506a2fcc3f1871f (node:11.2.0-slim)
Tagging node:11.2.0-slim
Tagging node:11.2-slim
Tagging node:11-slim
Tagging node:slim

$ test/run.sh node:11.2.0-slim
testing node:11.2.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-stretch
Using bashbrew/cache:c3b6a70d615c8aa447299c8b245ded8442260f27899fb00272631dd2d9e2bcd0 (node:11.2.0-stretch)
Tagging node:11.2.0-stretch
Tagging node:11.2-stretch
Tagging node:11-stretch
Tagging node:stretch
Tagging node:11.2.0
Tagging node:11.2
Tagging node:11
Tagging node:latest

$ test/run.sh node:11.2.0-stretch
testing node:11.2.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-jessie
Using bashbrew/cache:10b4d0e0b58cf41869e05c8b21f37b958a6500f7cb8c1b44a875433cb022b6a1 (node:10.13.0-jessie)
Tagging node:10.13.0-jessie
Tagging node:10.13-jessie
Tagging node:10-jessie
Tagging node:dubnium-jessie
Tagging node:10.13.0
Tagging node:10.13
Tagging node:10
Tagging node:dubnium

$ test/run.sh node:10.13.0-jessie
testing node:10.13.0-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-alpine
Using bashbrew/cache:e67fa433fd4a30001a0616e6a1d2c65c07c18faefee5792791a135f2bd797ca3 (node:10.13.0-alpine)
Tagging node:10.13.0-alpine
Tagging node:10.13-alpine
Tagging node:10-alpine
Tagging node:dubnium-alpine

$ test/run.sh node:10.13.0-alpine
testing node:10.13.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-slim
Using bashbrew/cache:423bf4bcbd0c9eff47616e8051dd872b3fcf69eb00e70d065f48870c9ebaa28e (node:10.13.0-slim)
Tagging node:10.13.0-slim
Tagging node:10.13-slim
Tagging node:10-slim
Tagging node:dubnium-slim

$ test/run.sh node:10.13.0-slim
testing node:10.13.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-stretch
Using bashbrew/cache:740bc4639119b9a446a88799ab8e383044678b6c1b96e9a9ee7b83b8562f9c08 (node:10.13.0-stretch)
Tagging node:10.13.0-stretch
Tagging node:10.13-stretch
Tagging node:10-stretch
Tagging node:dubnium-stretch

$ test/run.sh node:10.13.0-stretch
testing node:10.13.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:chakracore-8.11.1
Using bashbrew/cache:87de9f64cd61c5db496fd19fd8ee17dfe7d471cd57a9288ecf3fef0cf600f914 (node:chakracore-8.11.1)
Tagging node:chakracore-8.11.1
Tagging node:chakracore-8.11
Tagging node:chakracore-8

$ test/run.sh node:chakracore-8.11.1
testing node:chakracore-8.11.1
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:chakracore-10.6.0
Using bashbrew/cache:d9d66ef727c71a01a9706dd151000960f366e50699c8d16f252398d8ef364bc8 (node:chakracore-10.6.0)
Tagging node:chakracore-10.6.0
Tagging node:chakracore-10.6
Tagging node:chakracore-10
Tagging node:chakracore

$ test/run.sh node:chakracore-10.6.0
testing node:chakracore-10.6.0
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed

@tianon tianon merged commit 3b714e8 into docker-library:master Nov 19, 2018
@PeterDaveHello PeterDaveHello deleted the update-nodejs branch November 19, 2018 15:39
@PeterDaveHello
Copy link
Contributor Author

Thanks @tianon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants