Merge pull request #10 from StefanScherer/add-1809

Add 1809 variant to manifest-list

README.md

@@ -20,6 +20,8 @@ Simple HTTP docker service that prints it's container ID - for (almost) any Dock
       * windows/amd64 10.0.16299.x
     * Rebase this image to nanoserver:1803 SAC
       * windows/amd64 10.0.17134.x
+    * Rebase this image to nanoserver:1809 SAC
+      * windows/amd64 10.0.17763.x
   * Wait for all images to be on Docker Hub
   * Create and push the manifest list
     * preview of `docker manifest` command

deploy.ps1

@@ -44,6 +44,14 @@ if ($isWindows) {
     -t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1803" `
     -b microsoft/nanoserver:1803
 
+  Write-Host "Rebasing image to produce 1809 variant"
+  npm install -g rebase-docker-image
+  rebase-docker-image `
+    "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
+    -s microsoft/nanoserver:sac2016 `
+    -t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1809" `
+    -b stefanscherer/nanoserver:10.0.17763.1
+
 } else {
   # Linux
   if ($env:ARCH -eq "amd64") {
@@ -54,7 +62,8 @@ if ($isWindows) {
       "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" `
       "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
       "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1709" `
-      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803"
+      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803" `
+      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1809"
     docker manifest annotate "$($image):$env:APPVEYOR_REPO_TAG_NAME" "$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm --variant v6
     docker manifest annotate "$($image):$env:APPVEYOR_REPO_TAG_NAME" "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm64 --variant v8
     docker manifest push "$($image):$env:APPVEYOR_REPO_TAG_NAME"
@@ -66,7 +75,8 @@ if ($isWindows) {
       "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" `
       "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
       "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1709" `
-      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803"
+      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803" `
+      "$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1809"
     docker manifest annotate "$($image):latest" "$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm --variant v6
     docker manifest annotate "$($image):latest" "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm64 --variant v8
     docker manifest push "$($image):latest"