From 1fc5fded5a8e313b156f3ea4c6ebdeed19285860 Mon Sep 17 00:00:00 2001 From: Don Date: Fri, 15 Mar 2019 15:12:21 -0700 Subject: [PATCH] Update dockerfiles and manifest for windows --- docker/Dockerfile.windows.1803 | 12 +++++++----- ...erfile.windows.1709 => Dockerfile.windows.1809} | 12 +++++++----- docker/manifest.tmpl | 14 ++++++++++---- 3 files changed, 24 insertions(+), 14 deletions(-) rename docker/{Dockerfile.windows.1709 => Dockerfile.windows.1809} (67%) diff --git a/docker/Dockerfile.windows.1803 b/docker/Dockerfile.windows.1803 index 59b4ff2..cbd58a7 100644 --- a/docker/Dockerfile.windows.1803 +++ b/docker/Dockerfile.windows.1803 @@ -1,11 +1,13 @@ -FROM microsoft/windowsservercore:1803 AS git +# escape=` + +FROM mcr.microsoft.com/windows/servercore:1803 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \ - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.19.0-rc2.windows.1/MinGit-2.19.0.rc2.windows.1-64-bit.zip -OutFile git.zip; \ - Expand-Archive git.zip -DestinationPath C:\git +RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Expand-Archive git.zip -DestinationPath C:\git; -FROM microsoft/powershell:nanoserver-1803 +FROM mcr.microsoft.com/powershell:nanoserver-1803 COPY --from=git /git /git ADD windows/* /bin/ diff --git a/docker/Dockerfile.windows.1709 b/docker/Dockerfile.windows.1809 similarity index 67% rename from docker/Dockerfile.windows.1709 rename to docker/Dockerfile.windows.1809 index 1faea53..936400d 100644 --- a/docker/Dockerfile.windows.1709 +++ b/docker/Dockerfile.windows.1809 @@ -1,11 +1,13 @@ -FROM microsoft/windowsservercore:1709 AS git +# escape=` + +FROM mcr.microsoft.com/windows/servercore:1809 AS git SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; \ - Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.19.0-rc2.windows.1/MinGit-2.19.0.rc2.windows.1-64-bit.zip -OutFile git.zip; \ - Expand-Archive git.zip -DestinationPath C:\git +RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` + Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/MinGit-2.21.0-64-bit.zip -OutFile git.zip; ` + Expand-Archive git.zip -DestinationPath C:\git; -FROM microsoft/powershell:nanoserver-1709 +FROM mcr.microsoft.com/powershell:nanoserver-1809 COPY --from=git /git /git ADD windows/* /bin/ diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index b42fd0e..db2a16c 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -24,8 +24,14 @@ manifests: architecture: arm os: linux - - image: drone/git:windows-1803 + image: drone/git:windows-1803-amd64 platform: - architecture: arm - os: linux - os.version: 10.0.17134.165 + architecture: amd64 + os: windows + version: 1803 + - + image: drone/git:windows-1809-amd64 + platform: + architecture: amd64 + os: windows + version: 1809