From d344be8799fdaa0e845e3fe55c88706a215aa356 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 16 Mar 2022 07:46:49 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 20.10.12 to 20.10.13 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- ...{docker-cli-20.10.12.ebuild => docker-cli-20.10.13.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.12.ebuild => docker-20.10.13.ebuild} | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 ++-- .../changelog/updates/2022-03-16-docker-20.10.13-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.12.ebuild => docker-cli-20.10.13.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.12.ebuild => docker-20.10.13.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-16-docker-20.10.13-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 55a3682870..8c24d3befe 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.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f +DIST docker-cli-20.10.13.tar.gz 7508315 BLAKE2B 022d34f54d2b9d8be1be42e63c2dd1c10083852fed9f5ead2babe811ffefc6bb77eb97cdd64cfafd71be2f7eb175b6be1cd557e0547119adfc2bb92c0564176e SHA512 4f8db8772a6b01c02becd08e5a42a1dce5905aaf110cfa149c941792b438004775b150a0ecbcb3673d32be288c63f7da470813e12a9a03555ffe704ab490b081 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.13.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.12.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.13.ebuild index cfed0df18a..e051f11064 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.13.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=60293e390e +GIT_COMMIT=2b37d705c2 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 67a015b7b8..51b986a322 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.12.tar.gz 11091999 BLAKE2B e3b1c40d2dcd2df9b158942759e035d53481dbd63c0fda188ec8564b0249402f5eff5f25fcb1a53c5d9af5b4c49f0919fc07f1f52d0b7333044c0a9c12631c21 SHA512 f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753 +DIST docker-20.10.13.tar.gz 10989656 BLAKE2B 6eeaf49fd15ea33ec250839486731c4698fc97f06bed756327ed46454c9ba9107c0a96f02fff1793e8db89a9c0d016a3e4f6697beddf31e8f791c7d43b8cacbf SHA512 7e09257fb451b74a06565baa0f0fc69e17c98035cb8770c7bbcdb4fa91e4fbee516333c233d3363c7091c8772c44872027b79de102a8e6c5b9538321e9888768 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.13.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.12.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.13.ebuild index 5c344e308a..546d1664c6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.13.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=bd6d47cb47 +GIT_COMMIT=d430ff4739 # 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 9d4b950739..625de5fb81 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.12 - ~app-emulation/docker-cli-20.10.12 + ~app-emulation/docker-20.10.13 + ~app-emulation/docker-cli-20.10.13 ~app-emulation/containerd-1.6.1 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.1.0 diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-16-docker-20.10.13-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-16-docker-20.10.13-update.md new file mode 100644 index 0000000000..204e9edf7a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-03-16-docker-20.10.13-update.md @@ -0,0 +1 @@ +- Docker ([20.10.13](https://docs.docker.com/engine/release-notes/#201013))