diff options
| -rw-r--r-- | .github/workflows/.windows.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.e2e | 2 | ||||
| -rw-r--r-- | Dockerfile.simple | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 2 | ||||
| -rwxr-xr-x | hack/with-go-mod.sh | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index 80a6b8c4ec..4fafc0f7dc 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -15,7 +15,7 @@ on: default: false env: - GO_VERSION: 1.19.6 + GO_VERSION: "1.20" GOTESTLIST_VERSION: v0.3.1 TESTSTAT_VERSION: v0.1.3 WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 988076dc57..f8724e2b77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ on: pull_request: env: - GO_VERSION: 1.19.6 + GO_VERSION: "1.20" GOTESTLIST_VERSION: v0.3.1 TESTSTAT_VERSION: v0.1.3 ITG_CLI_MATRIX_SIZE: 6 diff --git a/Dockerfile b/Dockerfile index 9037a6c312..6a91ce97ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.6 +ARG GO_VERSION=1.20 ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" ARG XX_VERSION=1.1.2 diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 4307441f0c..03aca36087 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.19.6 +ARG GO_VERSION=1.20 FROM golang:${GO_VERSION}-alpine AS base ENV GO111MODULE=off diff --git a/Dockerfile.simple b/Dockerfile.simple index b894f18b7d..572f4a249c 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -ARG GO_VERSION=1.19.6 +ARG GO_VERSION=1.20 ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" diff --git a/Dockerfile.windows b/Dockerfile.windows index 5d21eac53d..72299eabf7 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -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.6 +ARG GO_VERSION=1.20 ARG GOTESTSUM_VERSION=v1.8.2 ARG GOWINRES_VERSION=v0.3.0 ARG CONTAINERD_VERSION=v1.7.0-beta.4 diff --git a/hack/with-go-mod.sh b/hack/with-go-mod.sh index 911eb3b50b..3be44d11ec 100755 --- a/hack/with-go-mod.sh +++ b/hack/with-go-mod.sh @@ -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 |