From 494c12850ff35659584ba2cf9049b560b95af230 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 18 Nov 2021 12:53:59 +0000 Subject: [PATCH 1/2] app-emulation: Upgrade Docker 20.10.10 to 20.10.11 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- ...{docker-cli-20.10.10.ebuild => docker-cli-20.10.11.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.10.ebuild => docker-20.10.11.ebuild} | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/{docker-cli-20.10.10.ebuild => docker-cli-20.10.11.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.10.ebuild => docker-20.10.11.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest index 75f49bfec3..769fc829cd 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest @@ -1 +1 @@ -DIST docker-cli-20.10.10.tar.gz 7527079 BLAKE2B 38d0783d7193e3c67b7129e40c7a69b02d1d38f138dbbb5a9d3f142e021e49cf319ced2f486892c2b3c73386c992592fd6cb843d59f36dd56369b57ed274638e SHA512 27760167b3a582bd0b1e4fbb98e0c45424d8bd58932efdf39cf5a9a33f1e44ffd37fa145fa04502cbfe15cd369fcfe19fbd28f40c4fe43167be62ab2ce328a46 +DIST docker-cli-20.10.11.tar.gz 7525026 BLAKE2B e7d7b32b2c978540a4b2fb994aea09678a90aae394d0a75a60775ebd7f491f55074e5b5ff6f57e70745510550f8348d8408a0916e7ea7c1d41b608b27f8d4944 SHA512 c0bd1ab77b6e8ac1b6fb094bb51ed488e0ed3ed6ead3181b9f761fcce6e4901b90a34e779a90365731e65765877a502399be2dd1af95293209b846fa69dee3b8 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild index 3500a6148a..4df787df34 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=ec1e6b3fce +GIT_COMMIT=e8f1871b07 EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index 84867a89f4..0df8d20e52 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1 +1 @@ -DIST docker-20.10.10.tar.gz 11086463 BLAKE2B 8d165a0a8d4fdd0fbc6744e3127675f85e6808648608c594bd2fa56c228419f31c7ee733e2228dab6e06250140cae7e09d146baf4fe45f7bd30f429abcc416b7 SHA512 7232d9709b40d46b6e6c7ab9e224380af49d2144be6275ca567ac8d9986bb7acf4ecd8784a4868dbaac353342d2f20b5483866ce4e23a73816d3eb50375d226a +DIST docker-20.10.11.tar.gz 11093318 BLAKE2B fb0e74a9fd67656ff9fd3288298dc3022a7a640fee07f45bafc84d6c79abc52896c7ad901c5387e22fe53ac0e5853f61e6e6174baac72d94dd00d1cfa0a99d56 SHA512 ac947e882abb02d52aea4aecb5dcfef6e23c86aadf98b49e3312ca3079dac7a01d6c936c0a4e51b3561def926ae50b4c5587063b8c58cac5c5de3c5e7985b120 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.11.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.11.ebuild index c6b378252e..5be0265952 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.11.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=cd2a8cd9ea +GIT_COMMIT=f6348707ab # Flatcar: force building with go1.17 like upstream does COREOS_GO_VERSION="go1.17" COREOS_GO_GO111MODULE="off" diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild index bc0e811644..9aa37e0eb7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild @@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - ~app-emulation/docker-20.10.10 - ~app-emulation/docker-cli-20.10.10 + ~app-emulation/docker-20.10.11 + ~app-emulation/docker-cli-20.10.11 ~app-emulation/containerd-1.5.8 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.0.2 From 218b96730b3b88dafa59d22c7bedb627c4e01b87 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 1 Oct 2021 16:14:34 +0200 Subject: [PATCH 2/2] app-emulation/docker-cli: use `${PV}` for CLI version Upstream isn't updating the file regularly, so use ${PV}. Closes: https://bugs.gentoo.org/815658 Closes: https://github.com/gentoo/gentoo/pull/22457 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Mathieu Tortuyaux Signed-off-by: William Hubbs --- .../app-emulation/docker-cli/docker-cli-20.10.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild index 4df787df34..60d8bd8301 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.11.ebuild @@ -44,7 +44,7 @@ src_compile() { export CGO_LDFLAGS="${CGO_LDFLAGS} -L${SYSROOT}/usr/$(get_libdir)" emake \ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="$(cat VERSION)" \ + VERSION="${PV}" \ GITCOMMIT="${GIT_COMMIT}" \ dynbinary