From fcdaa45fb409edd408c1bba987b1088b29aeef79 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 5 Oct 2021 14:08:42 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 20.10.8 to 20.10.9 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- .../{docker-cli-20.10.8.ebuild => docker-cli-20.10.9.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.8.ebuild => docker-20.10.9.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.8.ebuild => docker-cli-20.10.9.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.8.ebuild => docker-20.10.9.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 1a9426e263..32326b4ca4 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.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0 +DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df 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.9.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.9.ebuild index e285a64f4d..d6379b8310 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.9.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=311fbfaf7d +GIT_COMMIT=6ed7fbd180 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 2f298ea885..22fb9da30e 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.8.tar.gz 11080739 BLAKE2B 1e5c14e23c4e9c8b0568cf19c98cb4cdbedc43742357bed61201f0188d5e3f4949d5e2a2231fd89635290c8784678005dff707a4e00ececfb82d88c69d31d235 SHA512 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8 +DIST docker-20.10.9.tar.gz 11083239 BLAKE2B 16dbd22b67ecd626b638406fffaec3c62eeee7dc93e661f982e12436afa10f230da4257a22a38ab1df366026033207d00e6571f3b853477852f3e14f24d9f567 SHA512 e4ae9e37633c821892e929e7a5f9dab652fe17f348a24cd37778bc4bfc33d99cdb347e2f575966364a37664dcfa83d1500f2bff7d0b0398a890f2039155a0c0c 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.9.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.9.ebuild index 36e851bf36..79b3565fbb 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.9.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=4662437124 +GIT_COMMIT=76bfb9809e # 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 8b8c6ee877..444e812677 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.8 - ~app-emulation/docker-cli-20.10.8 + ~app-emulation/docker-20.10.9 + ~app-emulation/docker-cli-20.10.9 ~app-emulation/containerd-1.5.5 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.0.2