From b34c3e06a2fe2bff278feb64a521acc8a99b5583 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 14 Sep 2022 12:16:24 +0200 Subject: [PATCH] app-emulation/docker{,-cli}: build with Go 1.18 Now that the upstream Docker 20.10.18 started building the source with Go 1.18 instead of 1.17, we should also remove code to force building with 1.17 and simply build with 1.18. Otherwise the build fails like: ``` vendor/archive/tar/common.go:541:32: undefined: any vendor/archive/tar/strconv.go:204:15: undefined: strings.Cut vendor/archive/tar/strconv.go:254:20: undefined: strings.Cut vendor/archive/tar/strconv.go:276:13: undefined: strings.Cut ``` See also https://github.com/moby/moby/commit/3d4616f943b3. --- .../app-emulation/docker-cli/docker-cli-20.10.18.ebuild | 2 +- .../app-emulation/docker/docker-20.10.18.ebuild | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild index 4791b98af4..32715f2cfd 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild @@ -6,7 +6,7 @@ GIT_COMMIT=e32519c693 EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild index 374c3814f0..c6b6f91f16 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild @@ -4,12 +4,10 @@ EAPI=7 EGO_PN=github.com/docker/docker GIT_COMMIT=7f84219a3c -# Flatcar: force building with go1.17 like upstream does -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" COREOS_GO_GO111MODULE="off" inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot -# Flatcar: use coreos-go-depend to force building with go1.17 inherit coreos-go-depend DESCRIPTION="The core functions you need to create Docker images and run Docker containers"