Skip to content

Commit 1bf2f3a

Browse files
committed
Switch to Server 2019
1 parent 53ffb78 commit 1bf2f3a

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG golang=golang:nanoserver
2-
ARG target=microsoft/nanoserver:sac2016
2+
ARG target=mcr.microsoft.com/windows/nanoserver:1809
33

44
FROM $golang AS build
55

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 1.0.{build}
22
image:
3-
- Visual Studio 2017
3+
- Windows Server 2019
44
- Ubuntu
55

66
environment:
@@ -11,9 +11,9 @@ environment:
1111

1212
matrix:
1313
exclude:
14-
- image: Visual Studio 2017
14+
- image: Windows Server 2019
1515
ARCH: arm
16-
- image: Visual Studio 2017
16+
- image: Windows Server 2019
1717
ARCH: arm64
1818

1919
build_script:

deploy.ps1

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,32 @@ docker push "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME"
3030

3131
if ($isWindows) {
3232
# Windows
33+
Write-Host "Rebasing image to produce 2016/1607 variant"
34+
rebase-docker-image `
35+
"$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
36+
-s mcr.microsoft.com/windows/nanoserver:1809 `
37+
-t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1607" `
38+
-b mcr.microsoft.com/windows/nanoserver:sac2016
39+
3340
Write-Host "Rebasing image to produce 1709 variant"
3441
npm install -g rebase-docker-image
3542
rebase-docker-image `
3643
"$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
44+
-s mcr.microsoft.com/windows/nanoserver:1809 `
3745
-t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1709" `
3846
-b mcr.microsoft.com/windows/nanoserver:1709
3947

4048
Write-Host "Rebasing image to produce 1803 variant"
4149
rebase-docker-image `
4250
"$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
51+
-s mcr.microsoft.com/windows/nanoserver:1809 `
4352
-t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1803" `
4453
-b mcr.microsoft.com/windows/nanoserver:1803
4554

46-
Write-Host "Rebasing image to produce 1809 variant"
47-
rebase-docker-image `
48-
"$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
49-
-s mcr.microsoft.com/windows/nanoserver:sac2016 `
50-
-t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1809" `
51-
-b mcr.microsoft.com/windows/nanoserver:1809
52-
5355
Write-Host "Rebasing image to produce 1903 variant"
5456
rebase-docker-image `
5557
"$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME" `
56-
-s mcr.microsoft.com/windows/nanoserver:sac2016 `
58+
-s mcr.microsoft.com/windows/nanoserver:1809 `
5759
-t "$($image):$os-$env:ARCH-$env:APPVEYOR_REPO_TAG_NAME-1903" `
5860
-b mcr.microsoft.com/windows/nanoserver:1903
5961

@@ -65,10 +67,10 @@ if ($isWindows) {
6567
"$($image):linux-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
6668
"$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" `
6769
"$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" `
68-
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
70+
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1607" `
6971
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1709" `
7072
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803" `
71-
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1809" `
73+
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
7274
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1903"
7375
docker manifest annotate "$($image):$env:APPVEYOR_REPO_TAG_NAME" "$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm --variant v6
7476
docker manifest annotate "$($image):$env:APPVEYOR_REPO_TAG_NAME" "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm64 --variant v8
@@ -79,10 +81,10 @@ if ($isWindows) {
7981
"$($image):linux-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
8082
"$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" `
8183
"$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" `
82-
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
84+
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1607" `
8385
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1709" `
8486
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1803" `
85-
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1809" `
87+
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME" `
8688
"$($image):windows-amd64-$env:APPVEYOR_REPO_TAG_NAME-1903"
8789
docker manifest annotate "$($image):latest" "$($image):linux-arm-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm --variant v6
8890
docker manifest annotate "$($image):latest" "$($image):linux-arm64-$env:APPVEYOR_REPO_TAG_NAME" --os linux --arch arm64 --variant v8

0 commit comments

Comments
 (0)