From d1b0475d89c23dd3164ff329662f19697348deee Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Wed, 12 Jun 2019 10:16:39 +0800 Subject: [PATCH 1/2] Bump Golang 1.12.6 Signed-off-by: Jintao Zhang (cherry picked from commit 6f446d041bfd690856e63e1515d0d9514f9b684a) 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 1dad41e2cc52b..12fba7578b515 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ARG CROSS="false" -FROM golang:1.12.5 AS base +FROM golang:1.12.6 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 bba780329d490..2165578a02e51 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM golang:1.12.5-alpine as base +FROM golang:1.12.6-alpine as base RUN apk --no-cache add \ bash \ diff --git a/Dockerfile.simple b/Dockerfile.simple index d707d5c1c0e13..207d1f922d1b5 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.5 +FROM golang:1.12.6 # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/Dockerfile.windows b/Dockerfile.windows index 8edcc9225ff2b..c3f14a9c8ee34 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.5 ` +ENV GO_VERSION=1.12.6 ` GIT_VERSION=2.11.1 ` GOPATH=C:\go ` FROM_DOCKERFILE=1 From d27a919cd2260170f1520949b398df3c2bc93cb9 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Tue, 9 Jul 2019 12:00:37 +0800 Subject: [PATCH 2/2] Bump Golang 1.12.7 Signed-off-by: Jintao Zhang (cherry picked from commit aafdb63f21b3a90b0aeae171663039fa18a1c385) 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 12fba7578b515..211b431d1ed2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ARG CROSS="false" -FROM golang:1.12.6 AS base +FROM golang:1.12.7 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 2165578a02e51..f24d29a364a54 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM golang:1.12.6-alpine as base +FROM golang:1.12.7-alpine as base RUN apk --no-cache add \ bash \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 207d1f922d1b5..303b0cfd3567c 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.6 +FROM golang:1.12.7 # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/Dockerfile.windows b/Dockerfile.windows index c3f14a9c8ee34..7c034019d199e 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.6 ` +ENV GO_VERSION=1.12.7 ` GIT_VERSION=2.11.1 ` GOPATH=C:\go ` FROM_DOCKERFILE=1