diff --git a/node/4.8/Dockerfile b/node/4.8/Dockerfile index 0614bf53..511a7d63 100644 --- 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 index 3f310a83..308cfe5d 100644 --- 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 deleted file mode 100644 index 59e0a90e..00000000 --- a/node/6.11/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Node - -A Windows Server Core Docker container image with Node.js 6.11.5 installed. - -## Building - -``` -docker build -t node . -docker tag node:latest node:6.11.5 -``` diff --git a/node/6.11/Dockerfile b/node/6.12/Dockerfile similarity index 94% rename from node/6.11/Dockerfile rename to node/6.12/Dockerfile index 798867d9..2c8f5178 100644 --- a/node/6.11/Dockerfile +++ b/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 new file mode 100644 index 00000000..0fb727cd --- /dev/null +++ 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 b/node/6.12/nano/.gitignore similarity index 100% rename from node/6.11/nano/.gitignore rename to node/6.12/nano/.gitignore diff --git a/node/6.11/nano/Dockerfile b/node/6.12/nano/Dockerfile similarity index 93% rename from node/6.11/nano/Dockerfile rename to node/6.12/nano/Dockerfile index 4be6e3dc..cfa71e3f 100644 --- a/node/6.11/nano/Dockerfile +++ b/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 deleted file mode 100644 index 5f448cd8..00000000 --- a/node/8.6/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Node - -A Windows Server Core Docker container image with Node.js 8.6.0 installed. - -## Images - -- stefanscherer/node-windows:8.6.0 -> Windows Server Core + Node + NPM + Yarn -- stefanscherer/node-windows:8.6.0-build-tools -> + Python + C++ build tools -- stefanscherer/node-windows:8.6.0-nano -> Nano Server + Node + NPM + Yarn - -## Building - -``` -docker build -t node . -docker tag node:latest node:8.6.0 -``` diff --git a/node/8.6/build-tools/Dockerfile.insider b/node/8.6/build-tools/Dockerfile.insider deleted file mode 100644 index 04a2a99c..00000000 --- a/node/8.6/build-tools/Dockerfile.insider +++ /dev/null @@ -1,3 +0,0 @@ -FROM stefanscherer/node-windows:8.6.0-insider-core - -RUN npm install --global windows-build-tools diff --git a/node/8.6/Dockerfile b/node/8.9/Dockerfile similarity index 94% rename from node/8.6/Dockerfile rename to node/8.9/Dockerfile index 164d4451..f0b50e7e 100644 --- a/node/8.6/Dockerfile +++ b/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 b/node/8.9/Dockerfile.1709 similarity index 94% rename from node/8.6/Dockerfile.1709 rename to node/8.9/Dockerfile.1709 index 2b2dca92..20cd2acb 100644 --- a/node/8.6/Dockerfile.1709 +++ b/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 b/node/8.9/Dockerfile.insider similarity index 94% rename from node/8.6/Dockerfile.insider rename to node/8.9/Dockerfile.insider index 19734dcf..474d5421 100644 --- a/node/8.6/Dockerfile.insider +++ b/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 new file mode 100644 index 00000000..66294c6b --- /dev/null +++ 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 b/node/8.9/build-tools/Dockerfile similarity index 86% rename from node/8.6/build-tools/Dockerfile rename to node/8.9/build-tools/Dockerfile index 16d9cb5d..862c77f8 100644 --- a/node/8.6/build-tools/Dockerfile +++ b/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 new file mode 100644 index 00000000..4c4b83b9 --- /dev/null +++ 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 b/node/8.9/nano/.gitignore similarity index 100% rename from node/8.6/nano/.gitignore rename to node/8.9/nano/.gitignore diff --git a/node/8.6/nano/Dockerfile b/node/8.9/nano/Dockerfile similarity index 93% rename from node/8.6/nano/Dockerfile rename to node/8.9/nano/Dockerfile index e82c0c12..07ddebad 100644 --- a/node/8.6/nano/Dockerfile +++ b/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 b/node/8.9/nano/Dockerfile.1709 similarity index 93% rename from node/8.6/nano/Dockerfile.1709 rename to node/8.9/nano/Dockerfile.1709 index 683ca351..cf44e80b 100644 --- a/node/8.6/nano/Dockerfile.1709 +++ b/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 b/node/8.9/nano/Dockerfile.insider similarity index 93% rename from node/8.6/nano/Dockerfile.insider rename to node/8.9/nano/Dockerfile.insider index 5f50f3fd..24c5a3ad 100644 --- a/node/8.6/nano/Dockerfile.insider +++ b/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 index 880990e7..bf1c96ff 100644 --- 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 index d8ec169a..bcb26541 100644 --- 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 index 082b789f..fdf5bb2d 100644 --- 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"