From 3286c0dfaaf93f529b61a2bc2cbc4190889ab16e Mon Sep 17 00:00:00 2001
From: Laurent Goderre <laurent.goderre@gmail.com>
Date: Wed, 9 May 2018 10:26:11 -0400
Subject: [PATCH] temp

---
 10/windows/nanoserver/Dockerfile        | 18 +++++++++---------
 10/windows/windowsservercore/Dockerfile | 18 +++++++++---------
 6/windows/nanoserver/Dockerfile         | 14 +++++++-------
 6/windows/windowsservercore/Dockerfile  | 14 +++++++-------
 8/windows/nanoserver/Dockerfile         | 14 +++++++-------
 8/windows/windowsservercore/Dockerfile  | 14 +++++++-------
 9/windows/nanoserver/Dockerfile         | 14 +++++++-------
 9/windows/windowsservercore/Dockerfile  | 14 +++++++-------
 Dockerfile-nanoserver.template          |  9 +--------
 Dockerfile-windowsservercore.template   |  9 +--------
 update.sh                               |  2 +-
 11 files changed, 63 insertions(+), 77 deletions(-)

diff --git a/10/windows/nanoserver/Dockerfile b/10/windows/nanoserver/Dockerfile
index b2eefd3d08..b7f2656cee 100644
--- a/10/windows/nanoserver/Dockerfile
+++ b/10/windows/nanoserver/Dockerfile
@@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV NODE_VERSION 10.0.0
+ENV NODE_VERSION 10.1.0
 
 ENV GPG_VERSION 2.3.4
 
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
@@ -46,7 +46,7 @@ FROM microsoft/nanoserver
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV NODE_VERSION 10.0.0
+ENV NODE_VERSION 10.1.0
 
 COPY --from=download /nodejs /nodejs
 COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
diff --git a/10/windows/windowsservercore/Dockerfile b/10/windows/windowsservercore/Dockerfile
index 3f3b2be241..e46af283fd 100644
--- a/10/windows/windowsservercore/Dockerfile
+++ b/10/windows/windowsservercore/Dockerfile
@@ -2,7 +2,7 @@ FROM microsoft/windowsservercore as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV NODE_VERSION 10.0.0
+ENV NODE_VERSION 10.1.0
 
 ENV GPG_VERSION 2.3.4
 
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
@@ -46,7 +46,7 @@ FROM microsoft/windowsservercore
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV NODE_VERSION 10.0.0
+ENV NODE_VERSION 10.1.0
 
 COPY --from=download /nodejs /nodejs
 COPY --from=download [ "/Program Files (x86)/yarn", "/yarn" ]
diff --git a/6/windows/nanoserver/Dockerfile b/6/windows/nanoserver/Dockerfile
index 848752b890..eb7c0ff669 100644
--- a/6/windows/nanoserver/Dockerfile
+++ b/6/windows/nanoserver/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/6/windows/windowsservercore/Dockerfile b/6/windows/windowsservercore/Dockerfile
index 9d2d5ca624..8db3c30c28 100644
--- a/6/windows/windowsservercore/Dockerfile
+++ b/6/windows/windowsservercore/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/8/windows/nanoserver/Dockerfile b/8/windows/nanoserver/Dockerfile
index a59d034fe2..e514dcad09 100644
--- a/8/windows/nanoserver/Dockerfile
+++ b/8/windows/nanoserver/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/8/windows/windowsservercore/Dockerfile b/8/windows/windowsservercore/Dockerfile
index 7b03b2b98e..67c7fb190d 100644
--- a/8/windows/windowsservercore/Dockerfile
+++ b/8/windows/windowsservercore/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/9/windows/nanoserver/Dockerfile b/9/windows/nanoserver/Dockerfile
index 64c88cbc26..0fce893e24 100644
--- a/9/windows/nanoserver/Dockerfile
+++ b/9/windows/nanoserver/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/9/windows/windowsservercore/Dockerfile b/9/windows/windowsservercore/Dockerfile
index e03bdeb0d8..e3ccd9c2ec 100644
--- a/9/windows/windowsservercore/Dockerfile
+++ b/9/windows/windowsservercore/Dockerfile
@@ -11,13 +11,13 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
+      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5' \
+      'FD3A5288F042B6850C66B31F09FE44734EB7990E' \
+      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1' \
+      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D' \
+      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8' \
+      'B9AE9905FFD7803F25714661B63B535A4C206CA9' \
+      '56730D5401028683275BD23C23EFEFE93C4CFFFE' \
       '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
diff --git a/Dockerfile-nanoserver.template b/Dockerfile-nanoserver.template
index 4c34d7e697..d9448f667a 100644
--- a/Dockerfile-nanoserver.template
+++ b/Dockerfile-nanoserver.template
@@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
-      '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
+      "${NODE_KEYS[@]}"
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     } ; \
diff --git a/Dockerfile-windowsservercore.template b/Dockerfile-windowsservercore.template
index 7c81d48b9b..07b4fa8474 100644
--- a/Dockerfile-windowsservercore.template
+++ b/Dockerfile-windowsservercore.template
@@ -11,14 +11,7 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityPro
     Start-Process .\gpg4win.exe -ArgumentList '/S' -NoNewWindow -Wait ;
 
 RUN @( \
-      '94AE36675C464D64BAFA68DD7434390BDBE9B9C5', \
-      'FD3A5288F042B6850C66B31F09FE44734EB7990E', \
-      '71DCFD284A79C3B38668286BC97EC7A07EDE3FC1', \
-      'DD8F2338BAE7501E3DD5AC78C273792F7D83545D', \
-      'C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8', \
-      'B9AE9905FFD7803F25714661B63B535A4C206CA9', \
-      '56730D5401028683275BD23C23EFEFE93C4CFFFE', \
-      '77984A986EBC2AA786BC0F66B01FBB92821C587A' \
+      "${NODE_KEYS[@]}"
     ) | foreach { \
       gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $_ ; \
     } ; \
diff --git a/update.sh b/update.sh
index fc1379fcd8..9c1014de30 100755
--- a/update.sh
+++ b/update.sh
@@ -56,7 +56,7 @@ function update_node_version {
 			while read -r line
 			do
 				pattern="\"\\$\\{$(echo "$key_type" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\""
-				sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1${line}${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
+				sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1'${line}',${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak
 			done < "keys/$key_type.keys"
 			sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak
 		done