Merge pull request #29 from joyent/0.10.40-0.12.7

chorrell · chorrell · commit ba3357829cb9 · 2015-07-09T20:56:12.000-04:00
Update node to0.10.40 and 0.12.7. See: http://blog.nodejs.org/2015/07/09/node-v0-10-40-maintenance/ http://blog.nodejs.org/2015/07/09/node-v0-12-7-stable/
diff --git a/0.10/Dockerfile b/0.10/Dockerfile
@@ -5,7 +5,7 @@ FROM buildpack-deps:jessie
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.10.39
+ENV NODE_VERSION 0.10.40
 ENV NPM_VERSION 2.11.3
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
diff --git a/0.10/onbuild/Dockerfile b/0.10/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.10.39
+FROM node:0.10.40
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile
@@ -5,7 +5,7 @@ FROM debian:jessie
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.10.39
+ENV NODE_VERSION 0.10.40
 ENV NPM_VERSION 2.11.3
 
 RUN buildDeps='curl ca-certificates' \
diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile
@@ -5,7 +5,7 @@ FROM buildpack-deps:wheezy
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.10.39
+ENV NODE_VERSION 0.10.40
 ENV NPM_VERSION 2.11.3
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
diff --git a/0.12/Dockerfile b/0.12/Dockerfile
@@ -5,7 +5,7 @@ FROM buildpack-deps:jessie
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.12.6
+ENV NODE_VERSION 0.12.7
 ENV NPM_VERSION 2.11.3
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
diff --git a/0.12/onbuild/Dockerfile b/0.12/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.12.6
+FROM node:0.12.7
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile
@@ -5,7 +5,7 @@ FROM debian:jessie
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.12.6
+ENV NODE_VERSION 0.12.7
 ENV NPM_VERSION 2.11.3
 
 RUN buildDeps='curl ca-certificates' \
diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile
@@ -5,7 +5,7 @@ FROM buildpack-deps:wheezy
 # gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
 
-ENV NODE_VERSION 0.12.6
+ENV NODE_VERSION 0.12.7
 ENV NPM_VERSION 2.11.3
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:0.10.39`
	`1`	`+FROM node:0.10.40`
`2`	`2`
`3`	`3`	`RUN mkdir -p /usr/src/app`
`4`	`4`	`WORKDIR /usr/src/app`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:0.12.6`
	`1`	`+FROM node:0.12.7`
`2`	`2`
`3`	`3`	`RUN mkdir -p /usr/src/app`
`4`	`4`	`WORKDIR /usr/src/app`