Browse code

Switch Windows Dockerfile to golang 1.5.3

Also renamed the env-variable to match what
we use in other locations (for easier finding)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/01/16 08:52:53
Showing 1 changed files
... ...
@@ -11,7 +11,7 @@
11 11
 
12 12
 FROM windowsservercore
13 13
 
14
-ENV GOLANG_VERSION=1.5.2 \
14
+ENV GO_VERSION=1.5.3 \
15 15
     GIT_VERSION=2.7.0 \
16 16
     RSRC_COMMIT=e48dbf1b7fc464a9e85fcec450dddf80816b76e0 \
17 17
     GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \
... ...
@@ -32,7 +32,7 @@ RUN setx /M Path "c:\ProgramData\chocolatey\bin;c:\Program Files\Git\usr\bin;%Pa
32 32
 
33 33
 RUN powershell -command \
34 34
     sleep 2; \
35
-    curl.exe -L -k -o go.msi https://storage.googleapis.com/golang/go%GOLANG_VERSION%.windows-amd64.msi; \
35
+    curl.exe -L -k -o go.msi https://storage.googleapis.com/golang/go%GO_VERSION%.windows-amd64.msi; \
36 36
     curl.exe -L -k -o gcc.zip http://downloads.sourceforge.net/project/tdm-gcc/TDM-GCC%205%20series/5.1.0-tdm64-1/gcc-5.1.0-tdm64-1-core.zip ; \
37 37
     curl.exe -L -k -o runtime.zip http://downloads.sourceforge.net/project/tdm-gcc/MinGW-w64%20runtime/GCC%205%20series/mingw64runtime-v4-git20150618-gcc5-tdm64-1.zip ; \
38 38
     curl.exe -L -k -o binutils.zip http://downloads.sourceforge.net/project/tdm-gcc/GNU%20binutils/binutils-2.25-tdm64-1.zip