mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 08:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2151 from flatcar/docker-20.10.18-main

Browse Source 
Upgrade Docker in main from 20.10.17 to 20.10.18
This commit is contained in:
Dongsu Park 2022-09-15 15:48:48 +02:00 committed by GitHub
commit c1d602bab4
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/Manifest vendored
View File

@ -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

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.17.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.18.ebuild vendored
View File

@ -2,11 +2,11 @@
# 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}"
COREOS_GO_VERSION="go1.17"
COREOS_GO_VERSION="go1.18"
inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest vendored
View File

@ -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

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.17.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.18.ebuild vendored
View File

@ -3,13 +3,11 @@
EAPI=7
EGO_PN=github.com/docker/docker
GIT_COMMIT=26ac601558
# Flatcar: force building with go1.17 like upstream does
COREOS_GO_VERSION="go1.17"
GIT_COMMIT=7f84219a3c
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"

4
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild vendored
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/changelog/security/2022-09-14-docker-20.10.18.md vendored Normal file
View File

@ -0,0 +1 @@
- Docker ([CVE-2022-36109](https://nvd.nist.gov/vuln/detail/CVE-2022-36109))

1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-09-14-docker-20.10.18-update.md vendored Normal file
View File

@ -0,0 +1 @@
- Docker ([20.10.18](https://docs.docker.com/engine/release-notes/#201018))