Merge pull request #101 from StefanScherer/update-nodejs-774

StefanScherer · web-flow · commit 01ff803d7c9c · 2017-03-22T08:30:26.000+01:00
Update Node.js 7.7.4, 6.10.1, 4.8.1
diff --git a/node/4.8/Dockerfile b/node/4.8/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/windowsservercore
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 4.8.0
-ENV NODE_SHA256 eb405edf1076b094fc3980ae8a83e91b15e05da057f4c5a96510de5b9636edf4
+ENV NODE_VERSION 4.8.1
+ENV NODE_SHA256 edb47c31de7891ddb58d5e1024e31c91b49b4f2226cf6c3e0c41e715ee6111e4
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
     if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/4.8/README.md b/node/4.8/README.md
@@ -1,12 +1,12 @@
 # Node
 
-A Windows Server Core Docker container image with Node.js 4.8.0 installed.
+A Windows Server Core Docker container image with Node.js 4.8.1 installed.
 
 ## Building
 
 ```
 docker build -t node .
-docker tag node:latest node:4.8.0
+docker tag node:latest node:4.8.1
 ```
 
 ## Onbuild
diff --git a/node/4.8/nano/Dockerfile b/node/4.8/nano/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/nanoserver
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 4.8.0
-ENV NODE_SHA256 eb405edf1076b094fc3980ae8a83e91b15e05da057f4c5a96510de5b9636edf4
+ENV NODE_VERSION 4.8.1
+ENV NODE_SHA256 edb47c31de7891ddb58d5e1024e31c91b49b4f2226cf6c3e0c41e715ee6111e4
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
     if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/4.8/nano/onbuild/Dockerfile b/node/4.8/nano/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:4.8.0-nano
+FROM node:4.8.1-nanoserver
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/4.8/onbuild/Dockerfile b/node/4.8/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:4.8.0
+FROM node:4.8.1-windowsservercore
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/6.10/Dockerfile b/node/6.10/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/windowsservercore
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.0
-ENV NODE_SHA256 39c809fe02863963a4bb1eaa0daec59abcc92c0331447c3d3e06392a7f72b79c
+ENV NODE_VERSION 6.10.1
+ENV NODE_SHA256 28923f51691bb34dc399af4ceb567da487d7f4806aec5e6f0cfab1e6c3f2dd1c
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
     if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/6.10/README.md b/node/6.10/README.md
@@ -1,12 +1,12 @@
 # Node
 
-A Windows Server Core Docker container image with Node.js 6.10.0 installed.
+A Windows Server Core Docker container image with Node.js 6.10.1 installed.
 
 ## Building
 
 ```
 docker build -t node .
-docker tag node:latest node:6.10.0
+docker tag node:latest node:6.10.1
 ```
 
 ## Onbuild
diff --git a/node/6.10/nano/Dockerfile b/node/6.10/nano/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/nanoserver
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.10.0
-ENV NODE_SHA256 39c809fe02863963a4bb1eaa0daec59abcc92c0331447c3d3e06392a7f72b79c
+ENV NODE_VERSION 6.10.1
+ENV NODE_SHA256 28923f51691bb34dc399af4ceb567da487d7f4806aec5e6f0cfab1e6c3f2dd1c
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
 		if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/6.10/nano/onbuild/Dockerfile b/node/6.10/nano/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.10.0-nano
+FROM node:6.10.1-nanoserver
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/6.10/onbuild/Dockerfile b/node/6.10/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.10.0
+FROM node:6.10.1-windowsservercore
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/7.7/Dockerfile b/node/7.7/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/windowsservercore
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 7.7.3
-ENV NODE_SHA256 5d24781262a84adca35ed7a854076cf357e8ba9f37e5bcc2849f678b538302c7
+ENV NODE_VERSION 7.7.4
+ENV NODE_SHA256 dd573367cda68db3594544b973be2367c0df8fc5345402672079e6be873931cd
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
     if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/7.7/README.md b/node/7.7/README.md
@@ -1,12 +1,12 @@
 # Node
 
-A Windows Server Core Docker container image with Node.js 7.7.3 installed.
+A Windows Server Core Docker container image with Node.js 7.7.4 installed.
 
 ## Building
 
 ```
 docker build -t node .
-docker tag node:latest node:7.7.3
+docker tag node:latest node:7.7.4
 ```
 
 ## Onbuild
diff --git a/node/7.7/nano/Dockerfile b/node/7.7/nano/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/nanoserver
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 7.7.3
-ENV NODE_SHA256 5d24781262a84adca35ed7a854076cf357e8ba9f37e5bcc2849f678b538302c7
+ENV NODE_VERSION 7.7.4
+ENV NODE_SHA256 dd573367cda68db3594544b973be2367c0df8fc5345402672079e6be873931cd
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/node-v{0}-win-x64.zip' -f $env:NODE_VERSION) -OutFile 'node.zip' -UseBasicParsing ; \
 		if ((Get-FileHash node.zip -Algorithm sha256).Hash -ne $env:NODE_SHA256) {exit 1} ; \
diff --git a/node/7.7/nano/onbuild/Dockerfile b/node/7.7/nano/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7.7.3-nano
+FROM node:7.7.4-nanoserver
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/7.7/onbuild/Dockerfile b/node/7.7/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7.7.3
+FROM node:7.7.4-windowsservercore
 
 RUN mkdir \app
 WORKDIR /app
diff --git a/node/build.bat b/node/build.bat
@@ -1,6 +1,6 @@
-call :build 4.8.0 4.8 4
-call :build 6.10.0 6.10 6
-call :build 7.7.3 7.7 7
+call :build 4.8.1 4.8 4
+call :build 6.10.1 6.10 6
+call :build 7.7.4 7.7 7
 
 goto :eof
 :build
@@ -9,6 +9,7 @@ docker build -t node:%1 %2 || exit /b
 docker tag node:%1 node:latest || exit /b
 docker tag node:%1 node:%2 || exit /b
 docker tag node:%1 node:%3 || exit /b
+docker tag node:%1 node:%1-windowsservercore || exit /b
 
 docker build -t node:%1-onbuild %2/onbuild
 docker tag node:%1-onbuild node:%2-onbuild || exit /b
@@ -18,6 +19,7 @@ docker build -t node:%1-nano %2/nano || exit /b
 docker tag node:%1-nano node:latest-nano || exit /b
 docker tag node:%1-nano node:%2-nano || exit /b
 docker tag node:%1-nano node:%3-nano || exit /b
+docker tag node:%1-nano node:%1-nanoserver || exit /b
 
 docker build -t node:%1-nano-onbuild %2/nano/onbuild || exit /b
 docker tag node:%1-nano-onbuild node:%2-nano-onbuild || exit /b
diff --git a/node/push.bat b/node/push.bat
@@ -1,6 +1,6 @@
-call :push 4.8.0 4.8 4
-call :push 6.10.0 6.10 6
-call :push 7.7.3 7.7 7
+call :push 4.8.1 4.8 4
+call :push 6.10.1 6.10 6
+call :push 7.7.4 7.7 7
 
 goto :eof
 :push
diff --git a/node/sync-core.sh b/node/sync-core.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+cp 4*/Dockerfile ../../docker-node/4*/windows/windowsservercore/Dockerfile
+cp 4*/onbuild/Dockerfile ../../docker-node/4*/windows/windowsservercore/onbuild/Dockerfile
+
+cp 6*/Dockerfile ../../docker-node/6*/windows/windowsservercore/Dockerfile
+cp 6*/onbuild/Dockerfile ../../docker-node/6*/windows/windowsservercore/onbuild/Dockerfile
+
+cp 7*/Dockerfile ../../docker-node/7*/windows/windowsservercore/Dockerfile
+cp 7*/onbuild/Dockerfile ../../docker-node/7*/windows/windowsservercore/onbuild/Dockerfile
diff --git a/node/sync-nano.sh b/node/sync-nano.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+cp 4*/nano/Dockerfile ../../docker-node/4*/windows/nanoserver/Dockerfile
+cp 4*/nano/onbuild/Dockerfile ../../docker-node/4*/windows/nanoserver/onbuild/Dockerfile
+
+cp 6*/nano/Dockerfile ../../docker-node/6*/windows/nanoserver/Dockerfile
+cp 6*/nano/onbuild/Dockerfile ../../docker-node/6*/windows/nanoserver/onbuild/Dockerfile
+
+cp 7*/nano/Dockerfile ../../docker-node/7*/windows/nanoserver/Dockerfile
+cp 7*/nano/onbuild/Dockerfile ../../docker-node/7*/windows/nanoserver/onbuild/Dockerfile
diff --git a/node/test.bat b/node/test.bat
@@ -1,6 +1,6 @@
-call :test 4.8.0
-call :test 6.10.0
-call :test 7.7.3
+call :test 4.8.1
+call :test 6.10.1
+call :test 7.7.4
 
 goto :eof
 :test

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:4.8.0-nano`
	`1`	`+FROM node:4.8.1-nanoserver`
`2`	`2`
`3`	`3`	`RUN mkdir \app`
`4`	`4`	`WORKDIR /app`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:4.8.0`
	`1`	`+FROM node:4.8.1-windowsservercore`
`2`	`2`
`3`	`3`	`RUN mkdir \app`
`4`	`4`	`WORKDIR /app`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:6.10.0-nano`
	`1`	`+FROM node:6.10.1-nanoserver`
`2`	`2`
`3`	`3`	`RUN mkdir \app`
`4`	`4`	`WORKDIR /app`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:6.10.0`
	`1`	`+FROM node:6.10.1-windowsservercore`
`2`	`2`
`3`	`3`	`RUN mkdir \app`
`4`	`4`	`WORKDIR /app`