1. docker
  2. Commit 6d0823af0a1dd6e5792800d4f8788be28965fa1f
Browse code

Bump Golang 1.12.5

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 3a4c5b6a0dc82f139292ae565f66244470a41615)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Jintao Zhang authored on 2019/05/07 12:19:39
Showing 4 changed files
Dockerfile
History View file @ 6d0823a
... ... 
@@ -26,7 +26,7 @@
26 26
27 27 
 ARG CROSS="false"
28 28
29 
-FROM golang:1.12.4 AS base
29 
+FROM golang:1.12.5 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
Dockerfile.e2e
History View file @ 6d0823a
... ... 
@@ -1,4 +1,4 @@
1 
-FROM golang:1.12.4-alpine as base
1 
+FROM golang:1.12.5-alpine as base
2 2
3 3 
 RUN apk --no-cache add \
4 4 
     bash \
Dockerfile.simple
History View file @ 6d0823a
... ... 
@@ -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.4
8 
+FROM golang:1.12.5
9 9
10 10 
 # allow replacing httpredir or deb mirror
11 11 
 ARG APT_MIRROR=deb.debian.org
Dockerfile.windows
History View file @ 6d0823a
... ... 
@@ -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.4 `
171 
+ENV GO_VERSION=1.12.5 `
172 172 
     GIT_VERSION=2.11.1 `
173 173 
     GOPATH=C:\go `
174 174 
     FROM_DOCKERFILE=1