소스 검색

Merge pull request #44101 from thaJeztah/20.10_backport_bump_golang_1.18.6

Samuel Karp 2 년 전
부모
커밋
4855c28780
4개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      Dockerfile
  2. 1 1
      Dockerfile.e2e
  3. 1 1
      Dockerfile.simple
  4. 1 1
      Dockerfile.windows

+ 1 - 1
Dockerfile

@@ -3,7 +3,7 @@
 ARG CROSS="false"
 ARG CROSS="false"
 ARG SYSTEMD="false"
 ARG SYSTEMD="false"
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ARG GO_VERSION=1.18.5
+ARG GO_VERSION=1.18.6
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"
 ARG DOCKER_BUILDTAGS="apparmor seccomp"

+ 1 - 1
Dockerfile.e2e

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.5
+ARG GO_VERSION=1.18.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.18.5
+ARG GO_VERSION=1.18.6
 
 
 FROM golang:${GO_VERSION}-buster
 FROM golang:${GO_VERSION}-buster
 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.18.5
+ARG GO_VERSION=1.18.6
 ARG GOTESTSUM_VERSION=v1.7.0
 ARG GOTESTSUM_VERSION=v1.7.0
 
 
 # Environment variable notes:
 # Environment variable notes: