From d72d1f0e66907dcb956225e616d52e41fafa967f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Jun 2022 07:46:01 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 20.10.16 to 20.10.17 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- ...{docker-cli-20.10.16.ebuild => docker-cli-20.10.17.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.16.ebuild => docker-20.10.17.ebuild} | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 ++-- .../changelog/updates/2022-06-08-docker-20.10.17-update.md | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/{docker-cli-20.10.16.ebuild => docker-cli-20.10.17.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.16.ebuild => docker-20.10.17.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-08-docker-20.10.17-update.md 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 e7dc3d0d70..2890ff3731 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.16.tar.gz 7635926 BLAKE2B eb7ecde2770bb4e937f40b885604f5daa996f5644f78881d9814ae3cdfc7a0eec107519ef24bbabe0c726c8c83eaa475667fa251c3e9346fec597069ec36ba2e SHA512 90451f71f16f3bd1410b13c5df256ef1f422dd5b9b75d63cf318ee91a07bcb3ddb2876d2fee81e835d8daaee48c4e010c2daf4373de1095e2075fed8ee5fe75e +DIST docker-cli-20.10.17.tar.gz 7636087 BLAKE2B 2777ca5c310ffeca75a07f2667703a3f1d24b4d1c1691ffb58df3144b7bfe54bb2b9cb9896a253718b7f47ab4c246064c5944a1ca05328fe7924f9bb79e10ff3 SHA512 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild index 84d591657e..5d4c0e9e97 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=e9c4da7260 +GIT_COMMIT=bc8830106d 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 3b627086ae..e8c1524ee5 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.16.tar.gz 11182324 BLAKE2B 8d6676a24b3b53f9155a53eb55a1b5074c5724788102356cae8ead55dbf2f2c2875ea4a0a9eaee4a7720d8f11671b2f748eb8c61b67b81992342d1171feaaaa7 SHA512 5fdf87f98a951af87a334a5a403e36b975ff6c4647d0656dde2bd763d27562c620346f3746adafa1439c205869c721a3bef750f8302734499423ca789218f85d +DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild index 56ba3ab2a4..d4398af0fc 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=5403217440 +GIT_COMMIT=26ac601558 # 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 35daf82d30..7acea80d6b 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.16 - ~app-emulation/docker-cli-20.10.16 + ~app-emulation/docker-20.10.17 + ~app-emulation/docker-cli-20.10.17 ~app-emulation/containerd-1.6.4 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.1.2 diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-08-docker-20.10.17-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-08-docker-20.10.17-update.md new file mode 100644 index 0000000000..1ad5bd93c3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-06-08-docker-20.10.17-update.md @@ -0,0 +1 @@ +- Docker ([20.10.17](https://docs.docker.com/engine/release-notes/#201017))