Use helper image, add 1909

Author: StefanScherer

node/build.ps1

@@ -6,15 +6,15 @@ function buildVersion($majorMinorPatch, $majorMinor, $major) {
   }
 
   if (Test-Path $major\pure) {
-    docker build -t node:$majorMinorPatch-pure $major/pure
+    docker build --pull -t node:$majorMinorPatch-pure $major/pure
   }
 
-  docker build -t node:$majorMinorPatch-nanoserver $major/nano
+  docker build --pull -t node:$majorMinorPatch-nanoserver $major/nano
 }
 
 Write-Output "Build with server docker engine"
 # $ErrorActionPreference = 'Continue'
-$docker_version = "18-09-6"
+$docker_version = "19-03-5"
 wget -outfile $env:TEMP\docker.zip $("https://dockermsft.blob.core.windows.net/dockercontainer/docker-{0}.zip" -f $docker_version)
 Expand-Archive -Path $env:TEMP\docker.zip -DestinationPath $env:TEMP -Force
 copy $env:TEMP\docker\*.* $env:ProgramFiles\docker

node/push.ps1

@@ -20,26 +20,36 @@ function pushVersion($majorMinorPatch, $majorMinor, $major) {
 
     rebase-docker-image `
       stefanscherer/node-windows:$majorMinorPatch-pure-1809 `
-      -s mcr.microsoft.com/windows/nanoserver:1809 `
+      -s stefanscherer/nanoserver:1809 `
       -t stefanscherer/node-windows:$majorMinorPatch-pure-1803 `
-      -b mcr.microsoft.com/windows/nanoserver:1803
+      -b stefanscherer/nanoserver:1803
     rebase-docker-image `
       stefanscherer/node-windows:$majorMinorPatch-pure-1809 `
-      -s mcr.microsoft.com/windows/nanoserver:1809 `
+      -s stefanscherer/nanoserver:1809 `
       -t stefanscherer/node-windows:$majorMinorPatch-pure-1903 `
-      -b mcr.microsoft.com/windows/nanoserver:1903
+      -b stefanscherer/nanoserver:1903
+    rebase-docker-image `
+      stefanscherer/node-windows:$majorMinorPatch-pure-1809 `
+      -s stefanscherer/nanoserver:1809 `
+      -t stefanscherer/node-windows:$majorMinorPatch-pure-1909 `
+      -b stefanscherer/nanoserver:1909
   }
 
   rebase-docker-image `
     stefanscherer/node-windows:$majorMinorPatch-nanoserver-1809 `
-    -s mcr.microsoft.com/windows/nanoserver:1809 `
+    -s stefanscherer/nanoserver:1809 `
     -t stefanscherer/node-windows:$majorMinorPatch-nanoserver-1803 `
-    -b mcr.microsoft.com/windows/nanoserver:1803
+    -b stefanscherer/nanoserver:1803
   rebase-docker-image `
     stefanscherer/node-windows:$majorMinorPatch-nanoserver-1809 `
-    -s mcr.microsoft.com/windows/nanoserver:1809 `
+    -s stefanscherer/nanoserver:1809 `
     -t stefanscherer/node-windows:$majorMinorPatch-nanoserver-1903 `
-    -b mcr.microsoft.com/windows/nanoserver:1903
+    -b stefanscherer/nanoserver:1903
+  rebase-docker-image `
+    stefanscherer/node-windows:$majorMinorPatch-nanoserver-1809 `
+    -s stefanscherer/nanoserver:1809 `
+    -t stefanscherer/node-windows:$majorMinorPatch-nanoserver-1909 `
+    -b stefanscherer/nanoserver:1909
 
   $nanoManifest = @"
 image: stefanscherer/node-windows:{0}
@@ -60,6 +70,11 @@ manifests:
     platform:
       architecture: amd64
       os: windows
+  -
+    image: stefanscherer/node-windows:{0}-nanoserver-1909
+    platform:
+      architecture: amd64
+      os: windows
 "@
 
   $nanoManifest -f $majorMinorPatch, $majorMinor, $major | Out-File nanoserver.yml -Encoding Ascii
@@ -85,6 +100,11 @@ manifests:
     platform:
       architecture: amd64
       os: windows
+  -
+    image: stefanscherer/node-windows:{0}-pure-1909
+    platform:
+      architecture: amd64
+      os: windows
 "@
 
   $pureManifest -f $majorMinorPatch, $majorMinor, $major | Out-File pure.yml -Encoding Ascii