소스 검색

Upgrade to Go 1.20

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
Co-authored-by: Cory Snider <csnider@mirantis.com>
Signed-off-by: Cory Snider <csnider@mirantis.com>
Bjorn Neergaard 2 년 전
부모
커밋
d4e7a87b96
7개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      .github/workflows/.windows.yml
  2. 1 1
      .github/workflows/test.yml
  3. 1 1
      Dockerfile
  4. 1 1
      Dockerfile.e2e
  5. 1 1
      Dockerfile.simple
  6. 1 1
      Dockerfile.windows
  7. 1 1
      hack/with-go-mod.sh

+ 1 - 1
.github/workflows/.windows.yml

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

+ 1 - 1
.github/workflows/test.yml

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

+ 1 - 1
Dockerfile

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

+ 1 - 1
Dockerfile.e2e

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.19.6
+ARG GO_VERSION=1.20
 
 
 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.19.6
+ARG GO_VERSION=1.20
 
 
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

+ 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.19.6
+ARG GO_VERSION=1.20
 ARG GOTESTSUM_VERSION=v1.8.2
 ARG GOTESTSUM_VERSION=v1.8.2
 ARG GOWINRES_VERSION=v0.3.0
 ARG GOWINRES_VERSION=v0.3.0
 ARG CONTAINERD_VERSION=v1.7.0-beta.4
 ARG CONTAINERD_VERSION=v1.7.0-beta.4

+ 1 - 1
hack/with-go-mod.sh

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