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

Merge pull request #1501 from flatcar-linux/docker-20.10.12-main

Browse Source 
Upgrade Docker in main from 20.10.11 to 20.10.12
This commit is contained in:
Dongsu Park 2021-12-17 18:19:44 +01:00 committed by GitHub
commit 108d8055d8
6 changed files with 7 additions and 6 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.11.tar.gz 7525026 BLAKE2B e7d7b32b2c978540a4b2fb994aea09678a90aae394d0a75a60775ebd7f491f55074e5b5ff6f57e70745510550f8348d8408a0916e7ea7c1d41b608b27f8d4944 SHA512 c0bd1ab77b6e8ac1b6fb094bb51ed488e0ed3ed6ead3181b9f761fcce6e4901b90a34e779a90365731e65765877a502399be2dd1af95293209b846fa69dee3b8
DIST docker-cli-20.10.12.tar.gz 7527161 BLAKE2B 34a90f6df9f43507461307817e72cfb9e37f88d00e6fc50b8b16f3db9c573e54edc2eb2641ff4e091a2a73e936f8844011520efe5aaec37a9eb9880f5f81c51a SHA512 ac7c997f5751f2e34b9bcb9f026d3d0c2cd58c32a13e9255536b0eb0d7eabd81c42f2d608c0fe7725322b619f2360818b08379e847d598dd0bec570602ad224f

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

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
GIT_COMMIT=e8f1871b07
GIT_COMMIT=60293e390e
EGO_PN="github.com/docker/cli"
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.11.tar.gz 11093318 BLAKE2B fb0e74a9fd67656ff9fd3288298dc3022a7a640fee07f45bafc84d6c79abc52896c7ad901c5387e22fe53ac0e5853f61e6e6174baac72d94dd00d1cfa0a99d56 SHA512 ac947e882abb02d52aea4aecb5dcfef6e23c86aadf98b49e3312ca3079dac7a01d6c936c0a4e51b3561def926ae50b4c5587063b8c58cac5c5de3c5e7985b120
DIST docker-20.10.12.tar.gz 11091999 BLAKE2B e3b1c40d2dcd2df9b158942759e035d53481dbd63c0fda188ec8564b0249402f5eff5f25fcb1a53c5d9af5b4c49f0919fc07f1f52d0b7333044c0a9c12631c21 SHA512 f4122c8cbc67e6b7703856dc76d6f15d7fab1b2001d4916b89958d5319c16d8b8445881841ef4804e8d47d64694184aec1be93e22d7baceb021c4a99c2c03753

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

@ -3,7 +3,7 @@
EAPI=7
EGO_PN=github.com/docker/docker
GIT_COMMIT=f6348707ab
GIT_COMMIT=bd6d47cb47
# Flatcar: force building with go1.17 like upstream does
COREOS_GO_VERSION="go1.17"
COREOS_GO_GO111MODULE="off"

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.11
~app-emulation/docker-cli-20.10.11
~app-emulation/docker-20.10.12
~app-emulation/docker-cli-20.10.12
~app-emulation/containerd-1.5.8
~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.0.3

1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2021-12-15-docker-update.md vendored Normal file
View File

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