Explorar el Código

Merge pull request #40391 from thaJeztah/bump_golang_1.13.6

Update Golang 1.13.6
Akihiro Suda hace 5 años
padre
commit
e6265b2688
Se han modificado 4 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      Dockerfile
  2. 1 1
      Dockerfile.e2e
  3. 1 1
      Dockerfile.simple
  4. 1 1
      Dockerfile.windows

+ 1 - 1
Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.1.3-experimental
 # syntax=docker/dockerfile:1.1.3-experimental
 
 
 ARG CROSS="false"
 ARG CROSS="false"
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
 ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux"
 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux"

+ 1 - 1
Dockerfile.e2e

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 
 
 FROM golang:${GO_VERSION}-alpine AS base
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off
 ENV GO111MODULE=off

+ 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.
 
 
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 
 
 FROM golang:${GO_VERSION}-stretch
 FROM golang:${GO_VERSION}-stretch
 ENV GO111MODULE=off
 ENV GO111MODULE=off

+ 1 - 1
Dockerfile.windows

@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 
-ARG GO_VERSION=1.13.5
+ARG GO_VERSION=1.13.6
 ARG GOTESTSUM_COMMIT=v0.3.5
 ARG GOTESTSUM_COMMIT=v0.3.5
 
 
 # Environment variable notes:
 # Environment variable notes: