Merge pull request #138 from StefanScherer/build-golang-devel

Build devel version of Golang to test fix for #18555

Author: StefanScherer

golang/Dockerfile

@@ -2,9 +2,9 @@ FROM golang:1.8-nanoserver
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV GIT_VERSION 2.12.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 6238f65c4d8412b993cb092efde4954f8cb7da4def54d0c1533835f00e83fdad
+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
 
 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} ; \

golang/Dockerfile.devel

@@ -0,0 +1,29 @@
+FROM golang:1.8-windowsservercore AS build
+RUN mv /go /go1.8.1
+WORKDIR /
+RUN git clone https://github.com/golang/go
+WORKDIR /go/src
+ENV GOROOT_BOOTSTRAP C:/go1.8.1
+ENV CGO_ENABLED 0
+RUN cmd /C make.bat
+
+FROM microsoft/nanoserver
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+ENV GOPATH C:\\gopath
+RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
+  Write-Host ('Updating PATH: {0}' -f $newPath); \
+  setx /M PATH $newPath;
+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
+
+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} ; \
+    Expand-Archive git.zip -DestinationPath C:\git; \
+    Remove-Item git.zip; \
+    Write-Host 'Updating PATH ...'; \
+    $env:PATH = 'C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin;' + $env:PATH; \
+    Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH

golang/build.ps1

@@ -1 +1,4 @@
+. $PSScriptRoot\..\update-docker-ce.ps1
+
 docker build -t golang .
+docker build -t golang:devel -f Dockerfile.devel .

golang/push.ps1

@@ -2,3 +2,6 @@ docker tag golang stefanscherer/golang-windows:1.8
 docker tag golang stefanscherer/golang-windows
 docker push stefanscherer/golang-windows:1.8
 docker push stefanscherer/golang-windows
+
+docker tag golang:devel stefanscherer/golang-windows:devel
+docker push stefanscherer/golang-windows:devel

golang/test.ps1

@@ -1,2 +1,7 @@
+Write-Host Testing golang image
 docker run golang go version
 docker run golang git --version
+
+Write-Host Testing golang:devel image
+docker run golang:devel go version
+docker run golang:devel git --version