Browse code

Merge pull request #37950 from thaJeztah/bump_golang_1.11.1

Bump Golang 1.11.1

Akihiro Suda authored on 2018/10/04 15:54:54
Showing 4 changed files
... ...
@@ -24,7 +24,7 @@
24 24
 # the case. Therefore, you don't have to disable it anymore.
25 25
 #
26 26
 
27
-FROM golang:1.11.0 AS base
27
+FROM golang:1.11.1 AS base
28 28
 # allow replacing httpredir or deb mirror
29 29
 ARG APT_MIRROR=deb.debian.org
30 30
 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
... ...
@@ -1,5 +1,5 @@
1 1
 ## Step 1: Build tests
2
-FROM golang:1.11.0-alpine3.7 as builder
2
+FROM golang:1.11.1-alpine3.7 as builder
3 3
 
4 4
 RUN apk --no-cache add \
5 5
     bash \
... ...
@@ -5,7 +5,7 @@
5 5
 
6 6
 # This represents the bare minimum required to build and test Docker.
7 7
 
8
-FROM golang:1.11.0-stretch
8
+FROM golang:1.11.1-stretch
9 9
 
10 10
 # allow replacing httpredir or deb mirror
11 11
 ARG APT_MIRROR=deb.debian.org
... ...
@@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
161 161
 # Environment variable notes:
162 162
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
163 163
 #  - FROM_DOCKERFILE is used for detection of building within a container.
164
-ENV GO_VERSION=1.11 `
164
+ENV GO_VERSION=1.11.1 `
165 165
     GIT_VERSION=2.11.1 `
166 166
     GOPATH=C:\go `
167 167
     FROM_DOCKERFILE=1