Browse code

Dockerfile*: bump Go to 1.7.1

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

unclejack authored on 2016/09/08 06:42:35
Showing 7 changed files
... ...
@@ -120,7 +120,7 @@ RUN set -x \
120 120
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
121 121
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
122 122
 #            with a heads-up.
123
-ENV GO_VERSION 1.7
123
+ENV GO_VERSION 1.7.1
124 124
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
125 125
 	| tar -xzC /usr/local
126 126
 
... ...
@@ -100,7 +100,7 @@ RUN set -x \
100 100
 # so we use gccgo as bootstrap to build Go from source code.
101 101
 # We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
102 102
 # not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
103
-ENV GO_VERSION 1.7
103
+ENV GO_VERSION 1.7.1
104 104
 RUN mkdir /usr/src/go && curl -fsSL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \
105 105
 	&& cd /usr/src/go/src \
106 106
 	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
... ...
@@ -65,7 +65,7 @@ RUN cd /usr/local/lvm2 \
65 65
 # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
66 66
 
67 67
 # Install Go
68
-ENV GO_VERSION 1.7
68
+ENV GO_VERSION 1.7.1
69 69
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
70 70
 	| tar -xzC /usr/local
71 71
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
... ...
@@ -92,7 +92,7 @@ RUN set -x \
92 92
 # ppc64le doesn't have official go binaries, so use the version of go installed from the image
93 93
 # to build go from source.
94 94
 # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6
95
-ENV GO_VERSION 1.7
95
+ENV GO_VERSION 1.7.1
96 96
 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
97 97
 
98 98
 RUN set -x \
... ...
@@ -97,7 +97,7 @@ RUN cd /usr/local/lvm2 \
97 97
 
98 98
 ## BUILD GOLANG 1.7 with existing gccgo
99 99
 
100
-ENV GO_VERSION 1.7
100
+ENV GO_VERSION 1.7.1
101 101
 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
102 102
 ENV GOROOT_BOOTSTRAP /usr/local
103 103
 
... ...
@@ -49,7 +49,7 @@ RUN set -x \
49 49
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
50 50
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
51 51
 #            with a heads-up.
52
-ENV GO_VERSION 1.7
52
+ENV GO_VERSION 1.7.1
53 53
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
54 54
 	| tar -xzC /usr/local
55 55
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
... ...
@@ -34,7 +34,7 @@ FROM windowsservercore
34 34
 # Environment variable notes:
35 35
 #  - GO_VERSION must consistent with 'Dockerfile' used by Linux'.
36 36
 #  - FROM_DOCKERFILE is used for detection of building within a container.
37
-ENV GO_VERSION=1.7 \
37
+ENV GO_VERSION=1.7.1 \
38 38
     GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe \
39 39
     GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \
40 40
     FROM_DOCKERFILE=1