From ff2481c2ed3996a25a93aaf8f463e2cc67255aa0 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 18 Aug 2021 11:49:49 +0200 Subject: [PATCH] app-emulation/docker{,-cli}: switch to go1.16 Upstream has switched to go 1.16, but still doesn't use go modules. The ebuilds needed fixing up after the automated PR was created. Signed-off-by: Jeremi Piotrowski --- .../docker-cli/docker-cli-20.10.8.ebuild | 2 +- .../app-emulation/docker/docker-20.10.8.ebuild | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild index fdff43d172..2010055927 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild @@ -6,7 +6,7 @@ GIT_COMMIT=311fbfaf7d EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.16" 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.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild index a92b323a74..8885a28ed0 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild @@ -4,11 +4,12 @@ EAPI=7 EGO_PN=github.com/docker/docker GIT_COMMIT=4662437124 -# Flatcar: force building with go1.13 like upstream does -COREOS_GO_VERSION="go1.13" +# Flatcar: force building with go1.16 like upstream does +COREOS_GO_VERSION="go1.16" +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.13 +# Flatcar: use coreos-go-depend to force building with go1.16 inherit coreos-go-depend DESCRIPTION="The core functions you need to create Docker images and run Docker containers" @@ -206,11 +207,6 @@ src_compile() { fi done - # Flatcar: - # need to set go1.13 in DOCKER_BUILDTAGS, to avoid build - # failures caused by github.com/pkg/errors >= 0.9.1. - DOCKER_BUILDTAGS+=" go1.13" - # Flatcar: # inject LDFLAGS for torcx if use hardened; then