Merge pull request #45803 from corhere/backport-23.0/go_1.20.5

[23.0 backport] Update Go to go1.20.5
This commit is contained in:
Bjorn Neergaard 2023-06-24 07:36:38 -06:00 committed by GitHub
commit 14448e42fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions

View file

@ -15,7 +15,7 @@ on:
default: false
env:
GO_VERSION: 1.19.10
GO_VERSION: "1.20.5"
GOTESTLIST_VERSION: v0.3.1
TESTSTAT_VERSION: v0.1.3
WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore

View file

@ -15,7 +15,7 @@ on:
pull_request:
env:
GO_VERSION: 1.19.10
GO_VERSION: "1.20.5"
GOTESTLIST_VERSION: v0.3.1
TESTSTAT_VERSION: v0.1.3
ITG_CLI_MATRIX_SIZE: 6

View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.20.5
ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
ARG XX_VERSION=1.2.1

View file

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

View file

@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker.
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.20.5
ARG BASE_DEBIAN_DISTRO="bullseye"
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

View file

@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
# Use PowerShell as the default shell
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG GO_VERSION=1.19.10
ARG GO_VERSION=1.20.5
ARG GOTESTSUM_VERSION=v1.8.2
ARG GOWINRES_VERSION=v0.3.0
ARG CONTAINERD_VERSION=v1.6.21

View file

@ -23,7 +23,7 @@ else
tee "${ROOTDIR}/go.mod" >&2 <<- EOF
module github.com/docker/docker
go 1.18
go 1.19
EOF
trap 'rm -f "${ROOTDIR}/go.mod"' EXIT
fi