Build windows 1809 images

lucaslorentz · Jan 26, 2020 · c2a772f · c2a772f
1 parent b202164
commit c2a772f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Dockerfile-nanoserver-1803 b/Dockerfile-nanoserver-1803
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:1803
+FROM mcr.microsoft.com/windows/nanoserver:1803
 LABEL maintainer "Lucas Lorentz <lucaslorentzlara@hotmail.com>"
 
 EXPOSE 80 443 2015

diff --git a/Dockerfile-nanoserver-1809 b/Dockerfile-nanoserver-1809
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:1809
 LABEL maintainer "Lucas Lorentz <lucaslorentzlara@hotmail.com>"
 
 EXPOSE 80 443 2015

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -59,7 +59,7 @@ jobs:
 - job: Build_Images_Windows
   dependsOn: Build_Binaries
   pool:
-    vmImage: 'win1803'
+    vmImage: 'windows-2019'
   steps:
   - task: DownloadBuildArtifacts@0
     displayName: 'Download Build Artifacts'

diff --git a/push-images-windows.sh b/push-images-windows.sh
@@ -7,6 +7,7 @@ docker login -u lucaslorentz -p "$DOCKER_PASSWORD"
 if [[ "${BUILD_SOURCEBRANCH}" == "refs/heads/master" ]]; then
     echo "Pushing CI images"
     docker push lucaslorentz/caddy-docker-proxy:ci-nanoserver-1803
+    docker push lucaslorentz/caddy-docker-proxy:ci-nanoserver-1809
 fi
 
 if [[ "${RELEASE_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]; then
@@ -24,4 +25,12 @@ if [[ "${RELEASE_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]; then
     docker push lucaslorentz/caddy-docker-proxy:nanoserver-1803
     docker push lucaslorentz/caddy-docker-proxy:${PATCH_VERSION}-nanoserver-1803
     docker push lucaslorentz/caddy-docker-proxy:${MINOR_VERSION}-nanoserver-1803
+
+    # nanoserver-1809
+    docker tag lucaslorentz/caddy-docker-proxy:ci-nanoserver-1809 lucaslorentz/caddy-docker-proxy:nanoserver-1809
+    docker tag lucaslorentz/caddy-docker-proxy:ci-nanoserver-1809 lucaslorentz/caddy-docker-proxy:${PATCH_VERSION}-nanoserver-1809
+    docker tag lucaslorentz/caddy-docker-proxy:ci-nanoserver-1809 lucaslorentz/caddy-docker-proxy:${MINOR_VERSION}-nanoserver-1809
+    docker push lucaslorentz/caddy-docker-proxy:nanoserver-1809
+    docker push lucaslorentz/caddy-docker-proxy:${PATCH_VERSION}-nanoserver-1809
+    docker push lucaslorentz/caddy-docker-proxy:${MINOR_VERSION}-nanoserver-1809
 fi