From 46ee7963d26340cadb63f3b7123e7f085ba03217 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 18 May 2022 07:45:34 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 20.10.15 to 20.10.16 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- ...{docker-cli-20.10.15.ebuild => docker-cli-20.10.16.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.15.ebuild => docker-20.10.16.ebuild} | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 ++-- .../changelog/updates/2022-05-18-docker-20.10.16-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.15.ebuild => docker-cli-20.10.16.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.15.ebuild => docker-20.10.16.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-18-docker-20.10.16-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 50b9682c83..e7dc3d0d70 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.15.tar.gz 7510817 BLAKE2B 3e2b9e8175929314700bd87849639d438f3bbfb8b5a0ee3459e9d6ec03629137dc8f68e547bca27c8cabffc0cc52e6cdb8b18fae1ae9954815704b36fc6b276f SHA512 ccf405129f4447af9b73d068d47ffc13deb2711bed24a53122f762d7a12bd4716cf74ac069b0597e4931a18842c5d0bbd6a7f28ec1331873b83e4bd575da3a2c +DIST docker-cli-20.10.16.tar.gz 7635926 BLAKE2B eb7ecde2770bb4e937f40b885604f5daa996f5644f78881d9814ae3cdfc7a0eec107519ef24bbabe0c726c8c83eaa475667fa251c3e9346fec597069ec36ba2e SHA512 90451f71f16f3bd1410b13c5df256ef1f422dd5b9b75d63cf318ee91a07bcb3ddb2876d2fee81e835d8daaee48c4e010c2daf4373de1095e2075fed8ee5fe75e diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.15.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.15.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild index 1c2411ea94..84d591657e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.15.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.16.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=270374650a +GIT_COMMIT=e9c4da7260 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 4a076124b1..3b627086ae 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.15.tar.gz 11085641 BLAKE2B fbaec5aa24a980e4e1de78baea9d9f59673afc9fb48dfc7df4b309690b79ffe4ccf35556a2b6c2a6c6aee50b692857861f048aabdc7401e94ddb469ddbfbeb53 SHA512 df827e6c5695a32cbafedc0cd77df3f86a4b9a4f6f54403896d4360a172e319e0bb5bc8f26688e62d8540089c32630fc2407ddb25a3e70dea25ed134f4bdf955 +DIST docker-20.10.16.tar.gz 11182324 BLAKE2B 8d6676a24b3b53f9155a53eb55a1b5074c5724788102356cae8ead55dbf2f2c2875ea4a0a9eaee4a7720d8f11671b2f748eb8c61b67b81992342d1171feaaaa7 SHA512 5fdf87f98a951af87a334a5a403e36b975ff6c4647d0656dde2bd763d27562c620346f3746adafa1439c205869c721a3bef750f8302734499423ca789218f85d diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.15.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.15.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild index 900355d822..56ba3ab2a4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.15.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.16.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=beef2a3163 +GIT_COMMIT=5403217440 # 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 9de162ec70..35daf82d30 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.15 - ~app-emulation/docker-cli-20.10.15 + ~app-emulation/docker-20.10.16 + ~app-emulation/docker-cli-20.10.16 ~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-05-18-docker-20.10.16-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-18-docker-20.10.16-update.md new file mode 100644 index 0000000000..249baf6e0e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-05-18-docker-20.10.16-update.md @@ -0,0 +1 @@ +- Docker ([20.10.16](https://docs.docker.com/engine/release-notes/#201016))