Browse code

Merge pull request #39063 from tao12345666333/bump-golang-1.12.4

Bump Golang 1.12.4

Sebastiaan van Stijn authored on 2019/04/14 02:23:35
Showing 4 changed files
... ...
@@ -26,7 +26,7 @@
26 26
 
27 27
 ARG CROSS="false"
28 28
 
29
-FROM golang:1.12.3 AS base
29
+FROM golang:1.12.4 AS base
30 30
 # allow replacing httpredir or deb mirror
31 31
 ARG APT_MIRROR=deb.debian.org
32 32
 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.12.3-alpine as builder
2
+FROM golang:1.12.4-alpine 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.12.3
8
+FROM golang:1.12.4
9 9
 
10 10
 # allow replacing httpredir or deb mirror
11 11
 ARG APT_MIRROR=deb.debian.org
... ...
@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
168 168
 # Environment variable notes:
169 169
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
170 170
 #  - FROM_DOCKERFILE is used for detection of building within a container.
171
-ENV GO_VERSION=1.12.3 `
171
+ENV GO_VERSION=1.12.4 `
172 172
     GIT_VERSION=2.11.1 `
173 173
     GOPATH=C:\go `
174 174
     FROM_DOCKERFILE=1