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

[security] Update for Node.js v0.10.46, v0.12.15, v4.4.6 and v5.12.0 #1881

Merged
merged 1 commit into from
Jun 24, 2016
Merged

[security] Update for Node.js v0.10.46, v0.12.15, v4.4.6 and v5.12.0 #1881

merged 1 commit into from
Jun 24, 2016

Conversation

@tianon
Copy link
Member

tianon commented Jun 24, 2016

warning: insecure protocol git:// detected: git://github.com/nodejs/docker-node
diff --git a/node_0.10.45-onbuild/Dockerfile b/node_0.10.46-onbuild/Dockerfile
similarity index 90%
copy from node_0.10.45-onbuild/Dockerfile
copy to node_0.10.46-onbuild/Dockerfile
index b09b040..ec9e440 100644
--- a/node_0.10.45-onbuild/Dockerfile
+++ b/node_0.10.46-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.10.45
+FROM node:0.10.46

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_0.12.14-slim/Dockerfile b/node_0.10.46-slim/Dockerfile
similarity index 98%
copy from node_0.12.14-slim/Dockerfile
copy to node_0.10.46-slim/Dockerfile
index dfc1a90..e590759 100644
--- a/node_0.12.14-slim/Dockerfile
+++ b/node_0.10.46-slim/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.10.46

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_0.12.14-wheezy/Dockerfile b/node_0.10.46-wheezy/Dockerfile
similarity index 97%
copy from node_0.12.14-wheezy/Dockerfile
copy to node_0.10.46-wheezy/Dockerfile
index 69706ca..8234f88 100644
--- a/node_0.12.14-wheezy/Dockerfile
+++ b/node_0.10.46-wheezy/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.10.46

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_0.12.14/Dockerfile b/node_0.10.46/Dockerfile
similarity index 97%
copy from node_0.12.14/Dockerfile
copy to node_0.10.46/Dockerfile
index dd69ac5..f25439d 100644
--- a/node_0.12.14/Dockerfile
+++ b/node_0.10.46/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.10.46

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_0.10.45-onbuild/Dockerfile b/node_0.12.15-onbuild/Dockerfile
similarity index 90%
copy from node_0.10.45-onbuild/Dockerfile
copy to node_0.12.15-onbuild/Dockerfile
index b09b040..84e3fb0 100644
--- a/node_0.10.45-onbuild/Dockerfile
+++ b/node_0.12.15-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.10.45
+FROM node:0.12.15

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_0.12.14-slim/Dockerfile b/node_0.12.15-slim/Dockerfile
similarity index 98%
copy from node_0.12.14-slim/Dockerfile
copy to node_0.12.15-slim/Dockerfile
index dfc1a90..197c972 100644
--- a/node_0.12.14-slim/Dockerfile
+++ b/node_0.12.15-slim/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.12.15

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_0.12.14-wheezy/Dockerfile b/node_0.12.15-wheezy/Dockerfile
similarity index 97%
copy from node_0.12.14-wheezy/Dockerfile
copy to node_0.12.15-wheezy/Dockerfile
index 69706ca..c19b997 100644
--- a/node_0.12.14-wheezy/Dockerfile
+++ b/node_0.12.15-wheezy/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.12.15

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_0.12.14/Dockerfile b/node_0.12.15/Dockerfile
similarity index 97%
copy from node_0.12.14/Dockerfile
copy to node_0.12.15/Dockerfile
index dd69ac5..728d6c4 100644
--- a/node_0.12.14/Dockerfile
+++ b/node_0.12.15/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done

-ENV NODE_VERSION 0.12.14
+ENV NODE_VERSION 0.12.15

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_6.2.2-onbuild/Dockerfile b/node_4.4.6-onbuild/Dockerfile
similarity index 91%
copy from node_6.2.2-onbuild/Dockerfile
copy to node_4.4.6-onbuild/Dockerfile
index c24d107..501f873 100644
--- a/node_6.2.2-onbuild/Dockerfile
+++ b/node_4.4.6-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.2.2
+FROM node:4.4.6

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_6.2.2-slim/Dockerfile b/node_4.4.6-slim/Dockerfile
similarity index 98%
copy from node_6.2.2-slim/Dockerfile
copy to node_4.4.6-slim/Dockerfile
index 7ba6e7f..4bfcd6f 100644
--- a/node_6.2.2-slim/Dockerfile
+++ b/node_4.4.6-slim/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.2
+ENV NODE_VERSION 4.4.6

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_4.4.5-wheezy/Dockerfile b/node_4.4.6-wheezy/Dockerfile
similarity index 97%
copy from node_4.4.5-wheezy/Dockerfile
copy to node_4.4.6-wheezy/Dockerfile
index b8b3f24..9deb002 100644
--- a/node_4.4.5-wheezy/Dockerfile
+++ b/node_4.4.6-wheezy/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 4.4.5
+ENV NODE_VERSION 4.4.6

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_6.2.2/Dockerfile b/node_4.4.6/Dockerfile
similarity index 97%
copy from node_6.2.2/Dockerfile
copy to node_4.4.6/Dockerfile
index 4be0714..0053d76 100644
--- a/node_6.2.2/Dockerfile
+++ b/node_4.4.6/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.2
+ENV NODE_VERSION 4.4.6

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_6.2.2-onbuild/Dockerfile b/node_5.12.0-onbuild/Dockerfile
similarity index 90%
copy from node_6.2.2-onbuild/Dockerfile
copy to node_5.12.0-onbuild/Dockerfile
index c24d107..1c0ffdb 100644
--- a/node_6.2.2-onbuild/Dockerfile
+++ b/node_5.12.0-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.2.2
+FROM node:5.12.0

 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_6.2.2-slim/Dockerfile b/node_5.12.0-slim/Dockerfile
similarity index 98%
copy from node_6.2.2-slim/Dockerfile
copy to node_5.12.0-slim/Dockerfile
index 7ba6e7f..f1d83ce 100644
--- a/node_6.2.2-slim/Dockerfile
+++ b/node_5.12.0-slim/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.2
+ENV NODE_VERSION 5.12.0

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_5.11.1-wheezy/Dockerfile b/node_5.12.0-wheezy/Dockerfile
similarity index 97%
copy from node_5.11.1-wheezy/Dockerfile
copy to node_5.12.0-wheezy/Dockerfile
index 5138855..1752671 100644
--- a/node_5.11.1-wheezy/Dockerfile
+++ b/node_5.12.0-wheezy/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 5.11.1
+ENV NODE_VERSION 5.12.0

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
diff --git a/node_6.2.2/Dockerfile b/node_5.12.0/Dockerfile
similarity index 97%
copy from node_6.2.2/Dockerfile
copy to node_5.12.0/Dockerfile
index 4be0714..34bd7ae 100644
--- a/node_6.2.2/Dockerfile
+++ b/node_5.12.0/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.2
+ENV NODE_VERSION 5.12.0

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \

@tianon
Copy link
Member

tianon commented Jun 24, 2016

LGTM

Build test of #1881; dff7adf (node):

$ bashbrew build node:0.10.46
warning: insecure protocol git:// detected: git://github.com/nodejs/docker-node
Building bashbrew/cache:a555f77f191a424727e0082662fcae624e1105b8d9b4384b50f7f2183ab9d0b8 (node:0.10.46)
Tagging node:0.10.46
Tagging node:0.10

$ test/run.sh node:0.10.46
testing node:0.10.46
    '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:0.10.46-onbuild
Building bashbrew/cache:90385d4cd82ed648b232646310507c3e4bb1cb86d42043ea65b3369a90bfce2f (node:0.10.46-onbuild)
Tagging node:0.10.46-onbuild
Tagging node:0.10-onbuild

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


$ bashbrew build node:0.10.46-slim
Building bashbrew/cache:8d1ef9edcd4fe92ba5cc11ec8a4ecf336beae7da2ac14e02173fa0c3fef1688d (node:0.10.46-slim)
Tagging node:0.10.46-slim
Tagging node:0.10-slim

$ test/run.sh node:0.10.46-slim
testing node:0.10.46-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:0.10.46-wheezy
Building bashbrew/cache:6112adaa83f54c9085f56f0720944b0e6b7e0793ade3ff18caea904249172508 (node:0.10.46-wheezy)
Tagging node:0.10.46-wheezy
Tagging node:0.10-wheezy

$ test/run.sh node:0.10.46-wheezy
testing node:0.10.46-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:0.12.15
Building bashbrew/cache:24c9ae5d276f8074d5794a5eb1244099d05aab77c5e9a56161c1f4cf6a1ee07a (node:0.12.15)
Tagging node:0.12.15
Tagging node:0.12
Tagging node:0

$ test/run.sh node:0.12.15
testing node:0.12.15
    '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:0.12.15-onbuild
Building bashbrew/cache:85fd519fe7ac734d1b9a767b702b79ddfc43368dfb397a265072646b5a4f1dec (node:0.12.15-onbuild)
Tagging node:0.12.15-onbuild
Tagging node:0.12-onbuild
Tagging node:0-onbuild

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


$ bashbrew build node:0.12.15-slim
Building bashbrew/cache:deee94f870fd6f789636130430535e956a5d4ebbb5987b3b46ec4de80bb7460c (node:0.12.15-slim)
Tagging node:0.12.15-slim
Tagging node:0.12-slim
Tagging node:0-slim

$ test/run.sh node:0.12.15-slim
testing node:0.12.15-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:0.12.15-wheezy
Building bashbrew/cache:da6bfd2b7664f3a946bcdac8f13fdbc54bec4c4256d713a4b365821e86fd658d (node:0.12.15-wheezy)
Tagging node:0.12.15-wheezy
Tagging node:0.12-wheezy
Tagging node:0-wheezy

$ test/run.sh node:0.12.15-wheezy
testing node:0.12.15-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.4.6
Building bashbrew/cache:2a732bf0b3caf9c0c00d432e0765ef313487c9e3235d4f091aaabd289431a68b (node:4.4.6)
Tagging node:4.4.6
Tagging node:4.4
Tagging node:4
Tagging node:argon

$ test/run.sh node:4.4.6
testing node:4.4.6
    '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.4.6-onbuild
Building bashbrew/cache:7793e5220e20e508b56874c927b964d815a109e95656691ebfe45a3d2a8d20c9 (node:4.4.6-onbuild)
Tagging node:4.4.6-onbuild
Tagging node:4.4-onbuild
Tagging node:4-onbuild
Tagging node:argon-onbuild

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


$ bashbrew build node:4.4.6-slim
Building bashbrew/cache:71de04b2529204ab01c47aec1c41a78bfe006bf2dadd8993e2f88e1d8af87a33 (node:4.4.6-slim)
Tagging node:4.4.6-slim
Tagging node:4.4-slim
Tagging node:4-slim
Tagging node:argon-slim

$ test/run.sh node:4.4.6-slim
testing node:4.4.6-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.4.6-wheezy
Building bashbrew/cache:1842ffbb24f88da57327e1cd24db08a78ea8453c3cc52b151482355322d8bfad (node:4.4.6-wheezy)
Tagging node:4.4.6-wheezy
Tagging node:4.4-wheezy
Tagging node:4-wheezy
Tagging node:argon-wheezy

$ test/run.sh node:4.4.6-wheezy
testing node:4.4.6-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:5.12.0
Building bashbrew/cache:f0c7439866cf576e0dc4a8ac1833240fa064789b1018f9a8e4422e987c7b38aa (node:5.12.0)
Tagging node:5.12.0
Tagging node:5.12
Tagging node:5

$ test/run.sh node:5.12.0
testing node:5.12.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:5.12.0-onbuild
Building bashbrew/cache:986b535d164e45538b85df9fcdc28bb7ebdf00b982acf815da926e24bf6fe030 (node:5.12.0-onbuild)
Tagging node:5.12.0-onbuild
Tagging node:5.12-onbuild
Tagging node:5-onbuild

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


$ bashbrew build node:5.12.0-slim
Building bashbrew/cache:770925625e1a94a5f534c2b08624d87a78bcb9f7bcdfd1fa13e96b705ab1ee5c (node:5.12.0-slim)
Tagging node:5.12.0-slim
Tagging node:5.12-slim
Tagging node:5-slim

$ test/run.sh node:5.12.0-slim
testing node:5.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:5.12.0-wheezy
Building bashbrew/cache:c7c1d9f6f156984f822e7b49c99e5643d5ec08aa0909490a5231f53939aba95f (node:5.12.0-wheezy)
Tagging node:5.12.0-wheezy
Tagging node:5.12-wheezy
Tagging node:5-wheezy

$ test/run.sh node:5.12.0-wheezy
testing node:5.12.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.2.2
Using bashbrew/cache:97770591c724a24d8672f565c066954e021122f6f1f8a3f1528f69558cb4de89 (node:6.2.2)
Tagging node:6.2.2
Tagging node:6.2
Tagging node:6
Tagging node:latest

$ test/run.sh node:6.2.2
testing node:6.2.2
    '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.2.2-onbuild
Using bashbrew/cache:73e1164573c5d6e0681e1ec72488e4df590762b83f280168a7d5d6447ca047d7 (node:6.2.2-onbuild)
Tagging node:6.2.2-onbuild
Tagging node:6.2-onbuild
Tagging node:6-onbuild
Tagging node:onbuild

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


$ bashbrew build node:6.2.2-slim
Using bashbrew/cache:2ca116f63c2338b0743d17ea179320e2303adfea175e465784b430d3b712a1a9 (node:6.2.2-slim)
Tagging node:6.2.2-slim
Tagging node:6.2-slim
Tagging node:6-slim
Tagging node:slim

$ test/run.sh node:6.2.2-slim
testing node:6.2.2-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.2.2-wheezy
Using bashbrew/cache:eda1268ffc6e009268909efaf37fef7613fbe5c48d393a2f1667ced88e79430d (node:6.2.2-wheezy)
Tagging node:6.2.2-wheezy
Tagging node:6.2-wheezy
Tagging node:6-wheezy
Tagging node:wheezy

$ test/run.sh node:6.2.2-wheezy
testing node:6.2.2-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 02a396b into docker-library:master Jun 24, 2016
@chorrell
Copy link
Contributor Author

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.

2 participants