mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 21:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker{,-cli}: switch to go1.16

Browse Source 
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 <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2021-08-18 11:49:49 +02:00
parent a6aa1a604d
commit ff2481c2ed
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild vendored
View File

@ -6,7 +6,7 @@ GIT_COMMIT=311fbfaf7d
EGO_PN="github.com/docker/cli" EGO_PN="github.com/docker/cli"
COREOS_GO_PACKAGE="${EGO_PN}" 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 inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend

12
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild vendored
View File

@ -4,11 +4,12 @@
EAPI=7 EAPI=7
EGO_PN=github.com/docker/docker EGO_PN=github.com/docker/docker
GIT_COMMIT=4662437124 GIT_COMMIT=4662437124
# Flatcar: force building with go1.13 like upstream does # Flatcar: force building with go1.16 like upstream does
COREOS_GO_VERSION="go1.13" COREOS_GO_VERSION="go1.16"
COREOS_GO_GO111MODULE="off"
inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot 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 inherit coreos-go-depend
DESCRIPTION="The core functions you need to create Docker images and run Docker containers" DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
@ -206,11 +207,6 @@ src_compile() {
fi fi
done 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: # Flatcar:
# inject LDFLAGS for torcx # inject LDFLAGS for torcx
if use hardened; then if use hardened; then