From 961119db21b95504f819a31dfadd7115757fffb3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 11 Sep 2019 09:36:53 +0200 Subject: [PATCH 1/2] Dockerfile: set GO111MODULE=off Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 1 + Dockerfile.e2e | 2 +- Dockerfile.simple | 1 + Dockerfile.windows | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index edd41b1c86..11c02c92c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ FROM golang:${GO_VERSION}-stretch AS base ARG APT_MIRROR RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \ && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list +ENV GO111MODULE=off FROM base AS criu ARG DEBIAN_FRONTEND diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 2821747752..9c827df83a 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,7 +1,7 @@ ARG GO_VERSION=1.12.9 FROM golang:${GO_VERSION}-alpine AS base - +ENV GO111MODULE=off RUN apk --no-cache add \ bash \ btrfs-progs-dev \ diff --git a/Dockerfile.simple b/Dockerfile.simple index 3ecccd86cd..eb3a6ded7b 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -8,6 +8,7 @@ ARG GO_VERSION=1.12.9 FROM golang:${GO_VERSION}-stretch +ENV GO111MODULE=off # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/Dockerfile.windows b/Dockerfile.windows index 9b230b1b12..68f6d5ae25 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -173,6 +173,7 @@ ARG GO_VERSION=1.12.9 ENV GO_VERSION=${GO_VERSION} ` GIT_VERSION=2.11.1 ` GOPATH=C:\gopath ` + GO111MODULE=off ` FROM_DOCKERFILE=1 RUN ` From 38e4ae3bca76b9558eb44993c4208b41114c4597 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 17 Jul 2019 14:37:56 +0200 Subject: [PATCH 2/2] Bump Golang version 1.13.0 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 11c02c92c8..fe14b8ed9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ # ARG CROSS="false" -ARG GO_VERSION=1.12.9 +ARG GO_VERSION=1.13.0 ARG DEBIAN_FRONTEND=noninteractive FROM golang:${GO_VERSION}-stretch AS base diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 9c827df83a..e849ca5f4f 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.9 +ARG GO_VERSION=1.13.0 FROM golang:${GO_VERSION}-alpine AS base ENV GO111MODULE=off diff --git a/Dockerfile.simple b/Dockerfile.simple index eb3a6ded7b..0cdae0e884 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -ARG GO_VERSION=1.12.9 +ARG GO_VERSION=1.13.0 FROM golang:${GO_VERSION}-stretch ENV GO111MODULE=off diff --git a/Dockerfile.windows b/Dockerfile.windows index 68f6d5ae25..37fab66fe5 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -165,7 +165,7 @@ FROM microsoft/windowsservercore # Use PowerShell as the default shell SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ARG GO_VERSION=1.12.9 +ARG GO_VERSION=1.13.0 # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux.