From 9e5bebb1f58d4085d1b5fc1edb0ece1edd418c15 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 1 May 2018 13:40:27 -0400 Subject: [PATCH] Bump go version to 1.10.2 Signed-off-by: Brian Goff --- Dockerfile | 4 ++-- Dockerfile.e2e | 2 +- Dockerfile.simple | 2 +- Dockerfile.windows | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e21982081..c4651b7b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,10 @@ # the case. Therefore, you don't have to disable it anymore. # -FROM golang:1.10.1 AS base +FROM golang:1.10.2 AS base # FIXME(vdemeester) this is kept for other script depending on it to not fail right away # Remove this once the other scripts uses something else to detect the version -ENV GO_VERSION 1.10.1 +ENV GO_VERSION 1.10.2 # 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 78e863b1a4..77c9205d45 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,5 +1,5 @@ ## Step 1: Build tests -FROM golang:1.10.1-alpine3.7 as builder +FROM golang:1.10.2-alpine3.7 as builder RUN apk add --update \ bash \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 5c07a4f929..67a78003e1 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -42,7 +42,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # will need updating, to avoid errors. Ping #docker-maintainers on IRC # with a heads-up. # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored -ENV GO_VERSION 1.10.1 +ENV GO_VERSION 1.10.2 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \ | tar -xzC /usr/local ENV PATH /go/bin:/usr/local/go/bin:$PATH diff --git a/Dockerfile.windows b/Dockerfile.windows index 0b539375a6..0cc7aa4f5b 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -161,7 +161,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.10.1 ` +ENV GO_VERSION=1.10.2 ` GIT_VERSION=2.11.1 ` GOPATH=C:\go ` FROM_DOCKERFILE=1