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 8.5 with a new version of yarn #3450

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

SimenB
Copy link
Contributor

@SimenB SimenB commented Sep 14, 2017

@tianon
Copy link
Member

tianon commented Sep 14, 2017

Diff:
diff --git a/node_alpine/Dockerfile b/node_alpine/Dockerfile
index 41cdda2..99ac448 100644
--- a/node_alpine/Dockerfile
+++ b/node_alpine/Dockerfile
@@ -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.0.1
+ENV YARN_VERSION 1.0.2
 
 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 46851f2..776c78b 100644
--- a/node_latest/Dockerfile
+++ b/node_latest/Dockerfile
@@ -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.0.1
+ENV YARN_VERSION 1.0.2
 
 RUN set -ex \
   && for key in \
diff --git a/node_slim/Dockerfile b/node_slim/Dockerfile
index 0faf72b..dcb31b5 100644
--- a/node_slim/Dockerfile
+++ b/node_slim/Dockerfile
@@ -45,7 +45,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.0.1
+ENV YARN_VERSION 1.0.2
 
 RUN set -ex \
   && for key in \
diff --git a/node_stretch/Dockerfile b/node_stretch/Dockerfile
index bcc39f3..2c93fb5 100644
--- a/node_stretch/Dockerfile
+++ b/node_stretch/Dockerfile
@@ -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.0.1
+ENV YARN_VERSION 1.0.2
 
 RUN set -ex \
   && for key in \
diff --git a/node_wheezy/Dockerfile b/node_wheezy/Dockerfile
index 441a7d2..358f5b1 100644
--- a/node_wheezy/Dockerfile
+++ b/node_wheezy/Dockerfile
@@ -37,7 +37,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.0.1
+ENV YARN_VERSION 1.0.2
 
 RUN set -ex \
   && for key in \

@tianon
Copy link
Member

tianon commented Sep 14, 2017

LGTM

Build test of #3450; 76620d5 (node):

$ bashbrew build node:8.5.0
Building bashbrew/cache:65afcff8ab63c9f14b69c9c31b4576a7e8a0fca40ca797c88b0ee304217f2549 (node:8.5.0)
Tagging node:8.5.0
Tagging node:8.5
Tagging node:8
Tagging node:latest

$ test/run.sh node:8.5.0
testing node:8.5.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


$ bashbrew build node:8.5.0-alpine
Building bashbrew/cache:7b2a7b6dc2a94562ac735804f6a7b2652374dbccea46779e6b3612f0390b0baa (node:8.5.0-alpine)
Tagging node:8.5.0-alpine
Tagging node:8.5-alpine
Tagging node:8-alpine
Tagging node:alpine

$ test/run.sh node:8.5.0-alpine
testing node:8.5.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.5.0-onbuild
Building bashbrew/cache:8b8de71b6f8f60328f06cbc073a79dca12e621a326ae44f7d64c1c0de7366ba3 (node:8.5.0-onbuild)
Tagging node:8.5.0-onbuild
Tagging node:8.5-onbuild
Tagging node:8-onbuild
Tagging node:onbuild

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


$ bashbrew build node:8.5.0-slim
Building bashbrew/cache:9a0941f669add923c147a4fa4099c7fd1c1bba671beef63b4e247dd3c6266660 (node:8.5.0-slim)
Tagging node:8.5.0-slim
Tagging node:8.5-slim
Tagging node:8-slim
Tagging node:slim

$ test/run.sh node:8.5.0-slim
testing node:8.5.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.5.0-stretch
Building bashbrew/cache:9f0bea51bceaf050e88875512cc7aff05e1ab64e2b26ac59ec03086a7fe212ca (node:8.5.0-stretch)
Tagging node:8.5.0-stretch
Tagging node:8.5-stretch
Tagging node:8-stretch
Tagging node:stretch

$ test/run.sh node:8.5.0-stretch
testing node:8.5.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:8.5.0-wheezy
Building bashbrew/cache:794df6ba3223b82050da00bc825b8cf0d7475b0f9ac0ecf10533a53bbe7751b8 (node:8.5.0-wheezy)
Tagging node:8.5.0-wheezy
Tagging node:8.5-wheezy
Tagging node:8-wheezy
Tagging node:wheezy

$ test/run.sh node:8.5.0-wheezy
testing node:8.5.0-wheezy
	'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.11.3
Using bashbrew/cache:f93150c7b22662c920675b555772a9d0a3f0d964487ab01473dfa99333cb9d7d (node:6.11.3)
Tagging node:6.11.3
Tagging node:6.11
Tagging node:6
Tagging node:boron

$ test/run.sh node:6.11.3
testing node:6.11.3
	'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.11.3-alpine
Using bashbrew/cache:0349223999aff896f3062b4652bb18622edb40e19736640a1aea0411e4ea3d0f (node:6.11.3-alpine)
Tagging node:6.11.3-alpine
Tagging node:6.11-alpine
Tagging node:6-alpine
Tagging node:boron-alpine

$ test/run.sh node:6.11.3-alpine
testing node:6.11.3-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.11.3-onbuild
Using bashbrew/cache:f77b7da5b370ee19519fd15995c94da6881687008deaf1afcc1c19109ede12cc (node:6.11.3-onbuild)
Tagging node:6.11.3-onbuild
Tagging node:6.11-onbuild
Tagging node:6-onbuild
Tagging node:boron-onbuild

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


$ bashbrew build node:6.11.3-slim
Using bashbrew/cache:780b8135080d8590637ba1e7778cb3bbfe8aa8f10b36e2aadd753f2b55ee0fb2 (node:6.11.3-slim)
Tagging node:6.11.3-slim
Tagging node:6.11-slim
Tagging node:6-slim
Tagging node:boron-slim

$ test/run.sh node:6.11.3-slim
testing node:6.11.3-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.11.3-stretch
Using bashbrew/cache:63a79ab1189e304bdc814f25b46e143b88d37e4be77c0efb8be8d1e36ba7bb89 (node:6.11.3-stretch)
Tagging node:6.11.3-stretch
Tagging node:6.11-stretch
Tagging node:6-stretch
Tagging node:boron-stretch

$ test/run.sh node:6.11.3-stretch
testing node:6.11.3-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.11.3-wheezy
Using bashbrew/cache:37b85a64269d60d1f9e66ec37b109e95fc9ce97c32c4e4726cc17edd6655d9f6 (node:6.11.3-wheezy)
Tagging node:6.11.3-wheezy
Tagging node:6.11-wheezy
Tagging node:6-wheezy
Tagging node:boron-wheezy

$ test/run.sh node:6.11.3-wheezy
testing node:6.11.3-wheezy
	'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:4.8.4
Using bashbrew/cache:89b539aeb6371c9f5dcefed1618b71c1f04aa3ba04f6548691c7c3eed90b787e (node:4.8.4)
Tagging node:4.8.4
Tagging node:4.8
Tagging node:4
Tagging node:argon

$ test/run.sh node:4.8.4
testing node:4.8.4
	'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:4.8.4-alpine
Using bashbrew/cache:e6272cd77c7c2bca3cbf32e910a9f28c11b9e697e108300cc83a832be8fb1aa2 (node:4.8.4-alpine)
Tagging node:4.8.4-alpine
Tagging node:4.8-alpine
Tagging node:4-alpine
Tagging node:argon-alpine

$ test/run.sh node:4.8.4-alpine
testing node:4.8.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:4.8.4-onbuild
Using bashbrew/cache:71750cb8bbd4f18580184510c30298327366c5e9c418734c91f3b6cd9a674fae (node:4.8.4-onbuild)
Tagging node:4.8.4-onbuild
Tagging node:4.8-onbuild
Tagging node:4-onbuild
Tagging node:argon-onbuild

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


$ bashbrew build node:4.8.4-slim
Using bashbrew/cache:c94fb2eba72370d0557c35172ddcc7df57b23df21cc0c1001fe13807ccb09b7c (node:4.8.4-slim)
Tagging node:4.8.4-slim
Tagging node:4.8-slim
Tagging node:4-slim
Tagging node:argon-slim

$ test/run.sh node:4.8.4-slim
testing node:4.8.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:4.8.4-stretch
Using bashbrew/cache:b5e923b147414805ef80d03ff50135cfa524bf3eaa5ab2ab8538a816a5538bdb (node:4.8.4-stretch)
Tagging node:4.8.4-stretch
Tagging node:4.8-stretch
Tagging node:4-stretch
Tagging node:argon-stretch

$ test/run.sh node:4.8.4-stretch
testing node:4.8.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:4.8.4-wheezy
Using bashbrew/cache:826cd48de2cbeacb1cff64c6c347cf9206fea716e77b7c01a90bc565db7f992b (node:4.8.4-wheezy)
Tagging node:4.8.4-wheezy
Tagging node:4.8-wheezy
Tagging node:4-wheezy
Tagging node:argon-wheezy

$ test/run.sh node:4.8.4-wheezy
testing node:4.8.4-wheezy
	'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

@yosifkit yosifkit merged commit 29f306d into docker-library:master Sep 14, 2017
@SimenB SimenB deleted the patch-1 branch September 14, 2017 17:13
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