mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-29 17:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2412 from flatcar/docker-20.10.23-main

Browse Source 
Upgrade Docker in main from 20.10.22 to 20.10.23
This commit is contained in:
Dongsu Park 2023-01-27 08:51:29 +01:00 committed by GitHub
commit 464bc43cc5
7 changed files with 14 additions and 13 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.22.tar.gz 7590020 BLAKE2B ab003a9af2b441a9bad9c27345dea2e82087cfc8a8ac865adeb2e47e91be4bd9b27f499ae95b0ddcddb66d27c3498938682dcd10d5e3bef41fc18ce1f034a476 SHA512 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6 DIST docker-cli-20.10.23.tar.gz 7590153 BLAKE2B bcc32b93da8899f22483912d258f91b228410ca8cf95ba7e459a617a0b4755eb39f204cea6fda02ff5077732d554976bcbb38a830b58a239f269af159bb6fafa SHA512 c1debb583e9464d51ef482de29f63d6df1815eaae18cd66e5b4b36dee324f8c5c699134eee13ed4882e24aadaac37483a37e6729b734a60510271b107dc31cf0

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.22.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.23.ebuild vendored
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
GIT_COMMIT=267d2e514f GIT_COMMIT=8659133e59
EGO_PN="github.com/docker/cli" EGO_PN="github.com/docker/cli"
COREOS_GO_PACKAGE="${EGO_PN}" COREOS_GO_PACKAGE="${EGO_PN}"

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

@ -1 +1 @@
DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c DIST docker-20.10.23.tar.gz 11230920 BLAKE2B 705190c3cd775f375a422e9cae5bbc37fc1883e3f0b9ad164f23bd74c21430ca3ca098d8398c801aa1aea3a8630309c415234c61f0ba16a4576260ed51eaf4b5 SHA512 f6e13a275c7f368e90779b2bae4ded98c8949f398934fb249b10958973d86aaa3bc10a868fa64eb245e35ddb36ff14a89f6b20ff274e7e3b57a57daffa00c26d

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.22.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.23.ebuild vendored
View File

@ -3,7 +3,7 @@
EAPI=7 EAPI=7
EGO_PN=github.com/docker/docker EGO_PN=github.com/docker/docker
GIT_COMMIT=77485d3c99 GIT_COMMIT=112bdf3343
COREOS_GO_VERSION="go1.18" COREOS_GO_VERSION="go1.18"
COREOS_GO_GO111MODULE="off" COREOS_GO_GO111MODULE="off"

14
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/ppc64-buildmode.patch vendored
View File

@ -17,14 +17,14 @@ index 5ea3e373f2..7a911de15a 100644
--- a/hack/make/.binary --- a/hack/make/.binary
+++ b/hack/make/.binary +++ b/hack/make/.binary
@@ -70,7 +70,7 @@ hash_files() { @@ -70,7 +70,7 @@ hash_files() {
if [[ " $BUILDFLAGS " != *" -race "* ]]; then
# -buildmode=pie is not supported on Windows and Linux on mips and riscv64.
case "$(go env GOOS)/$(go env GOARCH)" in
- windows/* | linux/mips* | linux/riscv*) ;;
+ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;;
# -buildmode=pie is not supported on Windows and Linux on mips and riscv64. *)
case "$(go env GOOS)/$(go env GOARCH)" in BUILDFLAGS+=("-buildmode=pie")
- windows/* | linux/mips* | linux/riscv*) ;;
+ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;;
*)
BUILDFLAGS+=("-buildmode=pie")
-- --
2.32.0 2.32.0

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. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
~app-emulation/docker-20.10.22 ~app-emulation/docker-20.10.23
~app-emulation/docker-cli-20.10.22 ~app-emulation/docker-cli-20.10.23
~app-emulation/containerd-1.6.15 ~app-emulation/containerd-1.6.15
~app-emulation/docker-proxy-0.8.0_p20210525 ~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.4 ~app-emulation/docker-runc-1.1.4

1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2023-01-25-docker-20.10.23-update.md vendored Normal file
View File

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