Skip to content

Update for Node v6.11.0 LTS and fix regression in Node v8.0.0-onbuild variant #3039

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

Merged
merged 1 commit into from
Jun 8, 2017

Conversation

pesho
Copy link
Contributor

@pesho pesho commented Jun 7, 2017

@yosifkit
Copy link
Member

yosifkit commented Jun 7, 2017

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index eff342a..d090ced 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,16 +18,16 @@ node:6-alpine
 node:6-onbuild
 node:6-slim
 node:6-wheezy
-node:6.10
-node:6.10-alpine
-node:6.10-onbuild
-node:6.10-slim
-node:6.10-wheezy
-node:6.10.3
-node:6.10.3-alpine
-node:6.10.3-onbuild
-node:6.10.3-slim
-node:6.10.3-wheezy
+node:6.11
+node:6.11-alpine
+node:6.11-onbuild
+node:6.11-slim
+node:6.11-wheezy
+node:6.11.0
+node:6.11.0-alpine
+node:6.11.0-onbuild
+node:6.11.0-slim
+node:6.11.0-wheezy
 node:8
 node:8-alpine
 node:8-onbuild
diff --git a/node_boron-alpine/Dockerfile b/node_boron-alpine/Dockerfile
index 8b69f84..78bfdec 100644
--- a/node_boron-alpine/Dockerfile
+++ b/node_boron-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.4
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.3
+ENV NODE_VERSION 6.11.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -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 0.24.4
+ENV YARN_VERSION 0.24.6
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
diff --git a/node_boron-onbuild/Dockerfile b/node_boron-onbuild/Dockerfile
index c7f91ca..246f653 100644
--- a/node_boron-onbuild/Dockerfile
+++ b/node_boron-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.10.3
+FROM node:6.11.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_boron-slim/Dockerfile b/node_boron-slim/Dockerfile
index 7e8f957..1774dcb 100644
--- a/node_boron-slim/Dockerfile
+++ b/node_boron-slim/Dockerfile
@@ -21,7 +21,7 @@ RUN set -ex \
   done
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.3
+ENV NODE_VERSION 6.11.0
 
 RUN buildDeps='xz-utils' \
     && set -x \
@@ -36,7 +36,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 0.24.4
+ENV YARN_VERSION 0.24.6
 
 RUN set -ex \
   && for key in \
diff --git a/node_boron-wheezy/Dockerfile b/node_boron-wheezy/Dockerfile
index 0970213..dc66aff 100644
--- a/node_boron-wheezy/Dockerfile
+++ b/node_boron-wheezy/Dockerfile
@@ -21,7 +21,7 @@ RUN set -ex \
   done
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.3
+ENV NODE_VERSION 6.11.0
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -31,7 +31,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
   && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 0.24.4
+ENV YARN_VERSION 0.24.6
 
 RUN set -ex \
   && for key in \
diff --git a/node_boron/Dockerfile b/node_boron/Dockerfile
index 52ed786..6c54e42 100644
--- a/node_boron/Dockerfile
+++ b/node_boron/Dockerfile
@@ -21,7 +21,7 @@ RUN set -ex \
   done
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.3
+ENV NODE_VERSION 6.11.0
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -31,7 +31,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
   && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 0.24.4
+ENV YARN_VERSION 0.24.6
 
 RUN set -ex \
   && for key in \
diff --git a/node_onbuild/Dockerfile b/node_onbuild/Dockerfile
index e27e924..678358f 100644
--- a/node_onbuild/Dockerfile
+++ b/node_onbuild/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /usr/src/app
 ONBUILD ARG NODE_ENV
 ONBUILD ENV NODE_ENV $NODE_ENV
 ONBUILD COPY package.json /usr/src/app/
-ONBUILD RUN npm install && npm cache clean
+ONBUILD RUN npm install && npm cache clean --force
 ONBUILD COPY . /usr/src/app
 
 CMD [ "npm", "start" ]

@tianon
Copy link
Member

tianon commented Jun 8, 2017

LGTM

Build test of #3039; 4fe0c99 (node):

$ bashbrew build node:8.0.0
Building bashbrew/cache:e221a2f6d3cb745244a639dfc04d0cd16fdfb87be1abd3c13f4919eed5c376b9 (node:8.0.0)
Tagging node:8.0.0
Tagging node:8.0
Tagging node:8
Tagging node:latest

$ test/run.sh node:8.0.0
testing node:8.0.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.0.0-alpine
Using bashbrew/cache:3a629cb3b58552fac6ea41cd3448ca53b811c772a51bfc3f89c5554b32976044 (node:8.0.0-alpine)
Tagging node:8.0.0-alpine
Tagging node:8.0-alpine
Tagging node:8-alpine
Tagging node:alpine

$ test/run.sh node:8.0.0-alpine
testing node:8.0.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.0.0-onbuild
Building bashbrew/cache:de612cfb81588ad2b60732ea6e4ceb730f6aaa2b3c8d9d36e2ae61fed88af3fb (node:8.0.0-onbuild)
Tagging node:8.0.0-onbuild
Tagging node:8.0-onbuild
Tagging node:8-onbuild
Tagging node:onbuild

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


$ bashbrew build node:8.0.0-slim
Using bashbrew/cache:b8d5635c7771d3ed4db969d8af89bcbcd260742e0e4f4baccd46e348011afb6c (node:8.0.0-slim)
Tagging node:8.0.0-slim
Tagging node:8.0-slim
Tagging node:8-slim
Tagging node:slim

$ test/run.sh node:8.0.0-slim
testing node:8.0.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.0.0-wheezy
Using bashbrew/cache:cd0551c79ecaf79a75f13f573710db46cecf5839af13ed6498b1d7e80232c82c (node:8.0.0-wheezy)
Tagging node:8.0.0-wheezy
Tagging node:8.0-wheezy
Tagging node:8-wheezy
Tagging node:wheezy

$ test/run.sh node:8.0.0-wheezy
testing node:8.0.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.0
Building bashbrew/cache:00996c364f683d868226be10c1da7318d46bc8aaf5f3a4827d93720c181dfed1 (node:6.11.0)
Tagging node:6.11.0
Tagging node:6.11
Tagging node:6
Tagging node:boron

$ test/run.sh node:6.11.0
testing node:6.11.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:6.11.0-alpine
Building bashbrew/cache:5c868e46fa11baa213f17778af446c0da2e851a77bda156c6383446d270770bc (node:6.11.0-alpine)
Tagging node:6.11.0-alpine
Tagging node:6.11-alpine
Tagging node:6-alpine
Tagging node:boron-alpine

$ test/run.sh node:6.11.0-alpine
testing node:6.11.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:6.11.0-onbuild
Building bashbrew/cache:185887338dda7cfa9480a96e4e1849505cd296f600e6de4f70f360e69c4e394b (node:6.11.0-onbuild)
Tagging node:6.11.0-onbuild
Tagging node:6.11-onbuild
Tagging node:6-onbuild
Tagging node:boron-onbuild

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


$ bashbrew build node:6.11.0-slim
Building bashbrew/cache:4befc859117573241a41df5d097d2c7b588b549a61b843dbebd7db9bb2a48140 (node:6.11.0-slim)
Tagging node:6.11.0-slim
Tagging node:6.11-slim
Tagging node:6-slim
Tagging node:boron-slim

$ test/run.sh node:6.11.0-slim
testing node:6.11.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:6.11.0-wheezy
Building bashbrew/cache:25a900adf65e931b387ac03959cfe9c361fd1c87194717ff44ee3131a632c42e (node:6.11.0-wheezy)
Tagging node:6.11.0-wheezy
Tagging node:6.11-wheezy
Tagging node:6-wheezy
Tagging node:boron-wheezy

$ test/run.sh node:6.11.0-wheezy
testing node:6.11.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:4.8.3
Using bashbrew/cache:4bab75a7b715919a0fa2c3d3de3d830c1e2d4d59ba6011d076ae3cf4b203d533 (node:4.8.3)
Tagging node:4.8.3
Tagging node:4.8
Tagging node:4
Tagging node:argon

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

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

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


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

$ test/run.sh node:4.8.3-slim
testing node:4.8.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:4.8.3-wheezy
Using bashbrew/cache:594fbd5d7a24321a0593959ef139f8bcdd65ccbeadb7a2905e4ba25e58d327e1 (node:4.8.3-wheezy)
Tagging node:4.8.3-wheezy
Tagging node:4.8-wheezy
Tagging node:4-wheezy
Tagging node:argon-wheezy

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

@tianon tianon merged commit 56e622e into docker-library:master Jun 8, 2017
@timbru31
Copy link

timbru31 commented Jun 8, 2017

Nice, thanks! 👍

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.

5 participants