Merge pull request #232 from StefanScherer/update-node-6120-891

Update Node.js 6.12.0 and 8.9.1
StefanScherer · Nov 8, 2017 · 2061aa5 · 2061aa5
2 parents e3c1130 + a3be637
commit 2061aa5
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 74 deletions.
diff --git a/node/4.8/Dockerfile b/node/4.8/Dockerfile
@@ -8,14 +8,14 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }

diff --git a/node/4.8/nano/Dockerfile b/node/4.8/nano/Dockerfile
@@ -8,14 +8,14 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }

diff --git a/node/6.11/README.md b/node/6.11/README.md
diff --git a/node/6.11/Dockerfile → node/6.12/Dockerfile b/node/6.11/Dockerfile → node/6.12/Dockerfile
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/6.12/README.md b/node/6.12/README.md
@@ -0,0 +1,10 @@
+# Node
+
+A Windows Server Core Docker container image with Node.js 6.12.0 installed.
+
+## Building
+
+```
+docker build -t node .
+docker tag node:latest node:6.12.0
+```
diff --git a/node/6.11/nano/.gitignore → node/6.12/nano/.gitignore b/node/6.11/nano/.gitignore → node/6.12/nano/.gitignore
diff --git a/node/6.11/nano/Dockerfile → node/6.12/nano/Dockerfile b/node/6.11/nano/Dockerfile → node/6.12/nano/Dockerfile
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.6/README.md b/node/8.6/README.md
diff --git a/node/8.6/build-tools/Dockerfile.insider b/node/8.6/build-tools/Dockerfile.insider
diff --git a/node/8.6/Dockerfile → node/8.9/Dockerfile b/node/8.6/Dockerfile → node/8.9/Dockerfile
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.6/Dockerfile.1709 → node/8.9/Dockerfile.1709 b/node/8.6/Dockerfile.1709 → node/8.9/Dockerfile.1709
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.6/Dockerfile.insider → node/8.9/Dockerfile.insider b/node/8.6/Dockerfile.insider → node/8.9/Dockerfile.insider
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.9/README.md b/node/8.9/README.md
@@ -0,0 +1,16 @@
+# Node
+
+A Windows Server Core Docker container image with Node.js 8.9.1 installed.
+
+## Images
+
+- stefanscherer/node-windows:8.9.1 -> Windows Server Core + Node + NPM + Yarn
+- stefanscherer/node-windows:8.9.1-build-tools -> + Python + C++ build tools
+- stefanscherer/node-windows:8.9.1-nano -> Nano Server + Node + NPM + Yarn
+
+## Building
+
+```
+docker build -t node .
+docker tag node:latest node:8.9.1
+```
diff --git a/node/8.6/build-tools/Dockerfile → node/8.9/build-tools/Dockerfile b/node/8.6/build-tools/Dockerfile → node/8.9/build-tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.6.0-windowsservercore
+FROM node:8.9.1-windowsservercore
 
 RUN npm install --global windows-build-tools ; \
     $env:PATH += ';{0}\.windows-build-tools\python27' -f $env:USERPROFILE ; \

diff --git a/node/8.9/build-tools/Dockerfile.insider b/node/8.9/build-tools/Dockerfile.insider
@@ -0,0 +1,3 @@
+FROM stefanscherer/node-windows:8.9.1-insider-core
+
+RUN npm install --global windows-build-tools
diff --git a/node/8.6/nano/.gitignore → node/8.9/nano/.gitignore b/node/8.6/nano/.gitignore → node/8.9/nano/.gitignore
diff --git a/node/8.6/nano/Dockerfile → node/8.9/nano/Dockerfile b/node/8.6/nano/Dockerfile → node/8.9/nano/Dockerfile
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.6/nano/Dockerfile.1709 → node/8.9/nano/Dockerfile.1709 b/node/8.6/nano/Dockerfile.1709 → node/8.9/nano/Dockerfile.1709
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/8.6/nano/Dockerfile.insider → node/8.9/nano/Dockerfile.insider b/node/8.6/nano/Dockerfile.insider → node/8.9/nano/Dockerfile.insider
@@ -8,19 +8,19 @@ RUN Invoke-WebRequest $('https://files.gpg4win.org/gpg4win-vanilla-{0}.exe' -f $
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait
 
 RUN @( \
-    '9554F04D7259F04124DE6B476D5A82AC7E37093B', \
     '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
     'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
     '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
     'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
     'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-    '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
+    'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
+    '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+    '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     }
 
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.9.1
 
 RUN Invoke-WebRequest $('https://nodejs.org/dist/v{0}/SHASUMS256.txt.asc' -f $env:NODE_VERSION) -OutFile 'SHASUMS256.txt.asc' -UseBasicParsing ; \
     gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc

diff --git a/node/build.ps1 b/node/build.ps1
@@ -8,5 +8,5 @@ function buildVersion($majorMinorPatch, $majorMinor, $major) {
   docker build -t node:$majorMinorPatch-nanoserver $majorMinor/nano
 }
 
-buildVersion "6.11.5" "6.11" "6"
-buildVersion "8.6.0" "8.6" "8"
+buildVersion "6.12.0" "6.12" "6"
+buildVersion "8.9.1" "8.9" "8"
diff --git a/node/push.ps1 b/node/push.ps1
@@ -55,5 +55,5 @@ manifests:
 npm install -g rebase-docker-image
 choco install -y manifest-tool
 
-pushVersion "6.11.5" "6.11" "6"
-pushVersion "8.6.0" "8.6" "8"
+pushVersion "6.12.0" "6.12" "6"
+pushVersion "8.9.1" "8.9" "8"
diff --git a/node/test.ps1 b/node/test.ps1
@@ -23,5 +23,5 @@ function testVersion($majorMinorPatch) {
   testCommand "node:$majorMinorPatch-nanoserver" "npm.cmd" ""
 }
 
-testVersion "6.11.5"
-testVersion "8.6.0"
+testVersion "6.12.0"
+testVersion "8.9.1"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM stefanscherer/node-windows:8.9.1-insider-core

		RUN npm install --global windows-build-tools