Merge pull request moby#39549 from thaJeztah/bump_go_1.13

Bump go 1.13.0
rasata · Sep 19, 2019 · d49fa53 · d49fa53
2 parents 3cfb680 + 38e4ae3
commit d49fa53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,13 +25,14 @@
 #
 
 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
 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
@@ -1,7 +1,7 @@
-ARG GO_VERSION=1.12.9
+ARG GO_VERSION=1.13.0
 
 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
@@ -5,9 +5,10 @@
 
 # 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
 
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -165,14 +165,15 @@ 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.
 #  - FROM_DOCKERFILE is used for detection of building within a container.
 ENV GO_VERSION=${GO_VERSION} `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\gopath `
+    GO111MODULE=off `
     FROM_DOCKERFILE=1
 
 RUN `