Skip to content

Conversation

chorrell
Copy link
Contributor

@tianon
Copy link
Member

tianon commented Jun 17, 2016

warning: insecure protocol git:// detected: git://github.com/nodejs/docker-node
diff --git a/node_6.2.1-onbuild/Dockerfile b/node_6.2.2-onbuild/Dockerfile
similarity index 91%
rename from node_6.2.1-onbuild/Dockerfile
rename to node_6.2.2-onbuild/Dockerfile
index 28e5e17..c24d107 100644
--- a/node_6.2.1-onbuild/Dockerfile
+++ b/node_6.2.2-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.2.1
+FROM node:6.2.2

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

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.1
+ENV NODE_VERSION 6.2.2

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_6.2.1-wheezy/Dockerfile b/node_6.2.2-wheezy/Dockerfile
similarity index 97%
rename from node_6.2.1-wheezy/Dockerfile
rename to node_6.2.2-wheezy/Dockerfile
index b585876..871590d 100644
--- a/node_6.2.1-wheezy/Dockerfile
+++ b/node_6.2.2-wheezy/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.1
+ENV NODE_VERSION 6.2.2

 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.1/Dockerfile b/node_6.2.2/Dockerfile
similarity index 97%
rename from node_6.2.1/Dockerfile
rename to node_6.2.2/Dockerfile
index b6c3cfd..4be0714 100644
--- a/node_6.2.1/Dockerfile
+++ b/node_6.2.2/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.1
+ENV NODE_VERSION 6.2.2

 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.1/onbuild/Dockerfile b/node_6.2.2/onbuild/Dockerfile
similarity index 91%
rename from node_6.2.1/onbuild/Dockerfile
rename to node_6.2.2/onbuild/Dockerfile
index 28e5e17..c24d107 100644
--- a/node_6.2.1/onbuild/Dockerfile
+++ b/node_6.2.2/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.2.1
+FROM node:6.2.2

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

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.1
+ENV NODE_VERSION 6.2.2

 RUN buildDeps='xz-utils' \
     && set -x \
diff --git a/node_6.2.1/wheezy/Dockerfile b/node_6.2.2/wheezy/Dockerfile
similarity index 97%
rename from node_6.2.1/wheezy/Dockerfile
rename to node_6.2.2/wheezy/Dockerfile
index b585876..871590d 100644
--- a/node_6.2.1/wheezy/Dockerfile
+++ b/node_6.2.2/wheezy/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
   done

 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.2.1
+ENV NODE_VERSION 6.2.2

 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" \

@chorrell
Copy link
Contributor Author

@tianon
Copy link
Member

tianon commented Jun 17, 2016

LGTM

Build test of #1852; 22dd383 (node):

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

$ test/run.sh node:0.10.45
testing node:0.10.45
    '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.45-onbuild
Building bashbrew/cache:6dfc6b83eb486b17d75abb36aaa8420d6ca791a161229dbd5078c623b10e41c5 (node:0.10.45-onbuild)
Tagging node:0.10.45-onbuild
Tagging node:0.10-onbuild

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


$ bashbrew build node:0.10.45-slim
Building bashbrew/cache:1d0f7f7fb931c2a2a5e886cbb4059454f266210774a0ec70159a4636c7919287 (node:0.10.45-slim)
Tagging node:0.10.45-slim
Tagging node:0.10-slim

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

$ test/run.sh node:0.10.45-wheezy
testing node:0.10.45-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.14
Building bashbrew/cache:e4c12f00a4f34945e31a5586f0eb7ad02e2240017760689d19f8d6dc3dca9fbd (node:0.12.14)
Tagging node:0.12.14
Tagging node:0.12
Tagging node:0

$ test/run.sh node:0.12.14
testing node:0.12.14
    '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.14-onbuild
Building bashbrew/cache:6c117be5528c04c3e8356bee6ae4cb13022b79bcdefc1dceabfbac064df59724 (node:0.12.14-onbuild)
Tagging node:0.12.14-onbuild
Tagging node:0.12-onbuild
Tagging node:0-onbuild

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


$ bashbrew build node:0.12.14-slim
Building bashbrew/cache:323f93b3265104b438028972d2457f780743a5dab52c3411e907441288998b9b (node:0.12.14-slim)
Tagging node:0.12.14-slim
Tagging node:0.12-slim
Tagging node:0-slim

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

$ test/run.sh node:0.12.14-wheezy
testing node:0.12.14-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.5
Building bashbrew/cache:43dff5874e716ad327cf8afb9d990ebabc371272196b04f2ffaa0ea860dd4ee1 (node:4.4.5)
Tagging node:4.4.5
Tagging node:4.4
Tagging node:4
Tagging node:argon

$ test/run.sh node:4.4.5
testing node:4.4.5
    '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.5-onbuild
Building bashbrew/cache:95d8e93523522929135109e611f7821b91cad487258330ae23117538e9f715e4 (node:4.4.5-onbuild)
Tagging node:4.4.5-onbuild
Tagging node:4.4-onbuild
Tagging node:4-onbuild
Tagging node:argon-onbuild

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


$ bashbrew build node:4.4.5-slim
Building bashbrew/cache:a2cf2b4ecfaa34548e79ae9775b4d84b664172fdccbbc7acda393d92aa96db9e (node:4.4.5-slim)
Tagging node:4.4.5-slim
Tagging node:4.4-slim
Tagging node:4-slim
Tagging node:argon-slim

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

$ test/run.sh node:4.4.5-wheezy
testing node:4.4.5-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.11.1
Building bashbrew/cache:00848fe64a3aa889eac8a9b2230de330137b03f9d28c8c7a2a26800c6b3838fb (node:5.11.1)
Tagging node:5.11.1
Tagging node:5.11
Tagging node:5

$ test/run.sh node:5.11.1
testing node:5.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:5.11.1-onbuild
Building bashbrew/cache:f49f485b5cf60007d5a09852b8ffb2394e740e10f15df2b7efbfd02ad2f6d3ec (node:5.11.1-onbuild)
Tagging node:5.11.1-onbuild
Tagging node:5.11-onbuild
Tagging node:5-onbuild

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


$ bashbrew build node:5.11.1-slim
Building bashbrew/cache:95b373afbb3ad5ebf9a28d6834ee820b4b759213730a371263828d06020d81df (node:5.11.1-slim)
Tagging node:5.11.1-slim
Tagging node:5.11-slim
Tagging node:5-slim

$ test/run.sh node:5.11.1-slim
testing node:5.11.1-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.11.1-wheezy
Building bashbrew/cache:799f0ccc6321144faf31fa05aa92d7d3a0a261ee037e1b5a9c6387029403cdd0 (node:5.11.1-wheezy)
Tagging node:5.11.1-wheezy
Tagging node:5.11-wheezy
Tagging node:5-wheezy

$ test/run.sh node:5.11.1-wheezy
testing node:5.11.1-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
Building 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
Building 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
Building 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
Building 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
Copy link
Member

tianon commented Jun 17, 2016

@chorrell not strictly necessary, but you can if you'd like -- there's a new library file format: https://github.com/docker-library/official-images#instruction-format. No hurry to change, the new builder code is backwards compatible with the old library file format; we just want to let you know of the increased control that is available (and all the docker-library repos should be converted over if you want examples of what the script looks like for the new format in our repos)

@tianon tianon merged commit 49bdfba into docker-library:master Jun 17, 2016
@chorrell chorrell deleted the Node.js-v6.2.2 branch January 5, 2018 14:43
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.

3 participants