Sfoglia il codice sorgente

Merge pull request #38629 from thaJeztah/bump_golang_1.11.5

Bump Golang 1.11.5 (CVE-2019-6486)
Sebastiaan van Stijn 6 anni fa
parent
commit
27c7178933
4 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  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.
 # the case. Therefore, you don't have to disable it anymore.
 #
 #
 
 
-FROM golang:1.11.4 AS base
+FROM golang:1.11.5 AS base
 # allow replacing httpredir or deb mirror
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org
 ARG APT_MIRROR=deb.debian.org
 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
 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
 ## Step 1: Build tests
-FROM golang:1.11.4-alpine3.8 as builder
+FROM golang:1.11.5-alpine3.8 as builder
 
 
 RUN apk --no-cache add \
 RUN apk --no-cache add \
     bash \
     bash \

+ 1 - 1
Dockerfile.simple

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

+ 1 - 1
Dockerfile.windows

@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # Environment variable notes:
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
 #  - FROM_DOCKERFILE is used for detection of building within a container.
 #  - FROM_DOCKERFILE is used for detection of building within a container.
-ENV GO_VERSION=1.11.4 `
+ENV GO_VERSION=1.11.5 `
     GIT_VERSION=2.11.1 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1
     FROM_DOCKERFILE=1