From 6e8d9f3ac7c90e02bde155eb0e3e803ea2514e10 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 14 Sep 2022 07:56:26 +0000 Subject: [PATCH 1/3] app-emulation: Upgrade Docker 20.10.17 to 20.10.18 --- .../coreos-overlay/app-emulation/docker-cli/Manifest | 2 +- ...{docker-cli-20.10.17.ebuild => docker-cli-20.10.18.ebuild} | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-20.10.17.ebuild => docker-20.10.18.ebuild} | 2 +- .../coreos-overlay/app-torcx/docker/docker-20.10.ebuild | 4 ++-- .../changelog/updates/2022-09-14-docker-20.10.18-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.17.ebuild => docker-cli-20.10.18.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-20.10.17.ebuild => docker-20.10.18.ebuild} (99%) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-14-docker-20.10.18-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 2890ff3731..c97bf06f12 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.17.tar.gz 7636087 BLAKE2B 2777ca5c310ffeca75a07f2667703a3f1d24b4d1c1691ffb58df3144b7bfe54bb2b9cb9896a253718b7f47ab4c246064c5944a1ca05328fe7924f9bb79e10ff3 SHA512 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316 +DIST docker-cli-20.10.18.tar.gz 7637072 BLAKE2B 11e49463a3f97c8b85afb972541f8df55ffee620cad69e89ae665888a67545c0fe43b17136ef2f9bbf277bab8f852b34bb60757ece5eae3ffc268a0875625b2e SHA512 fe5359015041f99bacf7b674a99ab7772d9e71eb6c6fefd6acb28f2afee4321a7517a53497627ae9cae8c6e0c253971a53d0579a630a3d71986edd7300a0a8ab diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild index 5d4c0e9e97..4791b98af4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -GIT_COMMIT=bc8830106d +GIT_COMMIT=e32519c693 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 e8c1524ee5..bae889abf4 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.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4 +DIST docker-20.10.18.tar.gz 11193925 BLAKE2B 988f80246984fcda66d160f9086e57a269e28fb29c2f72456794a1762d8fe7f2435febf387b6e072c99eab674aeeaad314eda3591ce6d490aa143cc97ff7abd4 SHA512 202f9f4d455329907e87bd95549aa433b6c773d3067cc89d0bd2e087bddfc66faddd6c2019843e42bf3fed6d6584ba4ab61d762f436f8bb164aa11e6280c91c5 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild index d4398af0fc..374c3814f0 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild @@ -3,7 +3,7 @@ EAPI=7 EGO_PN=github.com/docker/docker -GIT_COMMIT=26ac601558 +GIT_COMMIT=7f84219a3c # 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 dfd2ffb1af..4efc9e05f3 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.17 - ~app-emulation/docker-cli-20.10.17 + ~app-emulation/docker-20.10.18 + ~app-emulation/docker-cli-20.10.18 ~app-emulation/containerd-1.6.8 ~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-runc-1.1.4 diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-14-docker-20.10.18-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-14-docker-20.10.18-update.md new file mode 100644 index 0000000000..e1bf4a44ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-14-docker-20.10.18-update.md @@ -0,0 +1 @@ +- Docker ([20.10.18](https://docs.docker.com/engine/release-notes/#201018)) From 6fa59b8b528162c22ba71dd24386b11d035317e5 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 14 Sep 2022 10:07:59 +0200 Subject: [PATCH 2/3] changelog: add changelog for Docker 20.10.18 --- .../changelog/security/2022-09-14-docker-20.10.18.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/security/2022-09-14-docker-20.10.18.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-09-14-docker-20.10.18.md b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-09-14-docker-20.10.18.md new file mode 100644 index 0000000000..9ea95eb20e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/security/2022-09-14-docker-20.10.18.md @@ -0,0 +1 @@ +- Docker ([CVE-2022-36109](https://nvd.nist.gov/vuln/detail/CVE-2022-36109)) From b34c3e06a2fe2bff278feb64a521acc8a99b5583 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 14 Sep 2022 12:16:24 +0200 Subject: [PATCH 3/3] app-emulation/docker{,-cli}: build with Go 1.18 Now that the upstream Docker 20.10.18 started building the source with Go 1.18 instead of 1.17, we should also remove code to force building with 1.17 and simply build with 1.18. Otherwise the build fails like: ``` vendor/archive/tar/common.go:541:32: undefined: any vendor/archive/tar/strconv.go:204:15: undefined: strings.Cut vendor/archive/tar/strconv.go:254:20: undefined: strings.Cut vendor/archive/tar/strconv.go:276:13: undefined: strings.Cut ``` See also https://github.com/moby/moby/commit/3d4616f943b3. --- .../app-emulation/docker-cli/docker-cli-20.10.18.ebuild | 2 +- .../app-emulation/docker/docker-20.10.18.ebuild | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild index 4791b98af4..32715f2cfd 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild @@ -6,7 +6,7 @@ GIT_COMMIT=e32519c693 EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild index 374c3814f0..c6b6f91f16 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild @@ -4,12 +4,10 @@ EAPI=7 EGO_PN=github.com/docker/docker GIT_COMMIT=7f84219a3c -# Flatcar: force building with go1.17 like upstream does -COREOS_GO_VERSION="go1.17" +COREOS_GO_VERSION="go1.18" COREOS_GO_GO111MODULE="off" inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot -# Flatcar: use coreos-go-depend to force building with go1.17 inherit coreos-go-depend DESCRIPTION="The core functions you need to create Docker images and run Docker containers"