From 6d0823af0a1dd6e5792800d4f8788be28965fa1f Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Tue, 7 May 2019 11:19:39 +0800 Subject: [PATCH] Bump Golang 1.12.5 Signed-off-by: Jintao Zhang (cherry picked from commit 3a4c5b6a0dc82f139292ae565f66244470a41615) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- Dockerfile.e2e | 2 +- Dockerfile.simple | 2 +- Dockerfile.windows | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc50584bae..1dad41e2cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ARG CROSS="false" -FROM golang:1.12.4 AS base +FROM golang:1.12.5 AS base # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 261ebd0253..bba780329d 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM golang:1.12.4-alpine as base +FROM golang:1.12.5-alpine as base RUN apk --no-cache add \ bash \ diff --git a/Dockerfile.simple b/Dockerfile.simple index eb732119c4..d707d5c1c0 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -FROM golang:1.12.4 +FROM golang:1.12.5 # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/Dockerfile.windows b/Dockerfile.windows index 4e493693ac..8edcc9225f 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - FROM_DOCKERFILE is used for detection of building within a container. -ENV GO_VERSION=1.12.4 ` +ENV GO_VERSION=1.12.5 ` GIT_VERSION=2.11.1 ` GOPATH=C:\go ` FROM_DOCKERFILE=1