Browse code

Merge pull request #39549 from thaJeztah/bump_go_1.13

Bump go 1.13.0

Tibor Vass authored on 2019/09/20 08:10:07
Showing 4 changed files
... ...
@@ -25,13 +25,14 @@
25 25
 #
26 26
 
27 27
 ARG CROSS="false"
28
-ARG GO_VERSION=1.12.9
28
+ARG GO_VERSION=1.13.0
29 29
 ARG DEBIAN_FRONTEND=noninteractive
30 30
 
31 31
 FROM golang:${GO_VERSION}-stretch AS base
32 32
 ARG APT_MIRROR
33 33
 RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
34 34
  && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
35
+ENV GO111MODULE=off
35 36
 
36 37
 FROM base AS criu
37 38
 ARG DEBIAN_FRONTEND
... ...
@@ -1,7 +1,7 @@
1
-ARG GO_VERSION=1.12.9
1
+ARG GO_VERSION=1.13.0
2 2
 
3 3
 FROM golang:${GO_VERSION}-alpine AS base
4
-
4
+ENV GO111MODULE=off
5 5
 RUN apk --no-cache add \
6 6
     bash \
7 7
     btrfs-progs-dev \
... ...
@@ -5,9 +5,10 @@
5 5
 
6 6
 # This represents the bare minimum required to build and test Docker.
7 7
 
8
-ARG GO_VERSION=1.12.9
8
+ARG GO_VERSION=1.13.0
9 9
 
10 10
 FROM golang:${GO_VERSION}-stretch
11
+ENV GO111MODULE=off
11 12
 
12 13
 # allow replacing httpredir or deb mirror
13 14
 ARG APT_MIRROR=deb.debian.org
... ...
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
165 165
 # Use PowerShell as the default shell
166 166
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
167 167
 
168
-ARG GO_VERSION=1.12.9
168
+ARG GO_VERSION=1.13.0
169 169
 
170 170
 # Environment variable notes:
171 171
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
... ...
@@ -173,6 +173,7 @@ ARG GO_VERSION=1.12.9
173 173
 ENV GO_VERSION=${GO_VERSION} `
174 174
     GIT_VERSION=2.11.1 `
175 175
     GOPATH=C:\gopath `
176
+    GO111MODULE=off `
176 177
     FROM_DOCKERFILE=1
177 178
 
178 179
 RUN `