From d95a5d982601b9a8980a63d3d0efb8d0e0eddf74 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 27 Oct 2021 07:47:22 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 20.10.9 to 20.10.10 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- .../{docker-cli-20.10.9.ebuild => docker-cli-20.10.10.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.9.ebuild => docker-20.10.10.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.9.ebuild => docker-cli-20.10.10.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.9.ebuild => docker-20.10.10.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 32326b4ca4..75f49bfec3 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.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df +DIST docker-cli-20.10.10.tar.gz 7527079 BLAKE2B 38d0783d7193e3c67b7129e40c7a69b02d1d38f138dbbb5a9d3f142e021e49cf319ced2f486892c2b3c73386c992592fd6cb843d59f36dd56369b57ed274638e SHA512 27760167b3a582bd0b1e4fbb98e0c45424d8bd58932efdf39cf5a9a33f1e44ffd37fa145fa04502cbfe15cd369fcfe19fbd28f40c4fe43167be62ab2ce328a46 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.9.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.9.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild index d6379b8310..3500a6148a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.9.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=6ed7fbd180 +GIT_COMMIT=ec1e6b3fce 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 22fb9da30e..84867a89f4 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.9.tar.gz 11083239 BLAKE2B 16dbd22b67ecd626b638406fffaec3c62eeee7dc93e661f982e12436afa10f230da4257a22a38ab1df366026033207d00e6571f3b853477852f3e14f24d9f567 SHA512 e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c +DIST docker-20.10.10.tar.gz 11086463 BLAKE2B 8d165a0a8d4fdd0fbc6744e3127675f85e6808648608c594bd2fa56c228419f31c7ee733e2228dab6e06250140cae7e09d146baf4fe45f7bd30f429abcc416b7 SHA512 7232d9709b40d46b6e6c7ab9e224380af49d2144be6275ca567ac8d9986bb7acf4ecd8784a4868dbaac353342d2f20b5483866ce4e23a73816d3eb50375d226a diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.9.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.9.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild index 79b3565fbb..c6b378252e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.9.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=76bfb9809e +GIT_COMMIT=cd2a8cd9ea # 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 dffb1eae5a..90af6be17e 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.9 - ~app-emulation/docker-cli-20.10.9 + ~app-emulation/docker-20.10.10 + ~app-emulation/docker-cli-20.10.10 ~app-emulation/containerd-1.5.7 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.0.2