volker.raschek
/
git-docker
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #10 from donny-dont/windows-dockerfiles [ci skip] 

Update dockerfiles and manifest for windows
This commit is contained in:
Brad Rydzewski 2019-03-15 15:20:22 -07:00 committed by GitHub
parent e7468f9a19 1fc5fded5a
commit 6dca8731a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/Dockerfile.windows.1803
View File

@ -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/

12
docker/Dockerfile.windows.1709 → docker/Dockerfile.windows.1809
View File

@ -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/

14
docker/manifest.tmpl
View File

@ -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