Parcourir la source

Merge pull request #38143 from thaJeztah/bump_golang_1.11.2

Bump Golang to 1.11.2
Sebastiaan van Stijn il y a 6 ans
Parent
commit
2f902930e9
4 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 1 1
      Dockerfile
  2. 1 1
      Dockerfile.e2e
  3. 1 1
      Dockerfile.simple
  4. 1 1
      Dockerfile.windows

+ 1 - 1
Dockerfile

@@ -24,7 +24,7 @@
 # the case. Therefore, you don't have to disable it anymore.
 #
 
-FROM golang:1.11.1 AS base
+FROM golang:1.11.2 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

+ 1 - 1
Dockerfile.e2e

@@ -1,5 +1,5 @@
 ## Step 1: Build tests
-FROM golang:1.11.1-alpine3.7 as builder
+FROM golang:1.11.2-alpine3.7 as builder
 
 RUN apk --no-cache add \
     bash \

+ 1 - 1
Dockerfile.simple

@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-FROM golang:1.11.1-stretch
+FROM golang:1.11.2-stretch
 
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org

+ 1 - 1
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.11.1 `
+ENV GO_VERSION=1.11.2 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1