Merge pull request #140 from StefanScherer/golang-with-git-2.13.0

Update git-for-windows 2.13.0
StefanScherer · May 12, 2017 · 7e80760 · 7e80760
2 parents c069222 + 150e0c3
commit 7e80760
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,6 +7,7 @@ environment:
   DOCKER_PASS:
     secure: 4gsl5WiqIztEWhL5fuhp9X0qT/mKg9fYzKYUUPf5WStIuNddv0fvIKGmvvyuFzzd
 install:
+  - ps: Write-Host Server version $(gp 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion').BuildLabEx
   - docker version
 
 build_script:

diff --git a/git-for-windows-issue/README.md b/git-for-windows-issue/README.md
@@ -3,6 +3,8 @@
 This is a test setup to test Git for Windows in a Windows Docker container.
 See https://github.com/git-for-windows/git/issues/1007
 
+**Update**: It seems to be fixed with git-for-windows 2.13.0
+
 ## Build the Docker image
 
 For simplicity I use Chocolatey to install Git for Windows.

diff --git a/golang/Dockerfile b/golang/Dockerfile
@@ -2,9 +2,9 @@ FROM golang:1.8-nanoserver
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV GIT_VERSION 2.12.2
-ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.2/MinGit-${GIT_VERSION}.2-64-bit.zip
-ENV GIT_SHA256 3918cd9ab42c9a22aa3934463fdb536485c84e6876e9aaab74003deb43a08a36
+ENV GIT_VERSION 2.13.0
+ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
+ENV GIT_SHA256 20acda973eca1df056ad08bec6e05c3136f40a1b90e2a290260dfc36e9c2c800
 
 RUN Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
     if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \

diff --git a/golang/Dockerfile.devel b/golang/Dockerfile.devel
@@ -16,9 +16,9 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 COPY --from=build /go /go
 WORKDIR $GOPATH
 
-ENV GIT_VERSION 2.12.2
-ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.2/MinGit-${GIT_VERSION}.2-64-bit.zip
-ENV GIT_SHA256 3918cd9ab42c9a22aa3934463fdb536485c84e6876e9aaab74003deb43a08a36
+ENV GIT_VERSION 2.13.0
+ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
+ENV GIT_SHA256 20acda973eca1df056ad08bec6e05c3136f40a1b90e2a290260dfc36e9c2c800
 
 RUN Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
     if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \