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

Merge pull request #451 from flatcar-linux/docker-19.03.12-alpha

Browse Source 
Upgrade Docker in Alpha from 19.03.11 to 19.03.12
This commit is contained in:
Dongsu Park 2020-07-01 12:21:34 +02:00 committed by GitHub
commit 8f99f0966e
14 changed files with 23 additions and 23 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-runc/docker-runc-1.0.0_rc90.ebuild vendored
View File

@ -7,7 +7,7 @@ GITHUB_URI="github.com/opencontainers/runc"
COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.13"
# the commit of runc that docker uses.
# see https://github.com/docker/docker-ce/blob/v19.03.11/components/engine/hack/dockerfile/install/runc.installer#L4
# see https://github.com/docker/docker-ce/blob/v19.03.12/components/engine/hack/dockerfile/install/runc.installer#L4
# Update the patch number when this commit is changed (i.e. the _p in the ebuild).
# The patch version is arbitrarily the number of commits since the tag version
# specified in the ebuild name. For example:

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

@ -1 +1 @@
DIST docker-19.03.11.tar.gz 17962968 BLAKE2B e0d227f00e9444b2b561d17f1ed78989fdcb9ce6f7c70176648e4f80d3e226b788a21bfbc72bfdd759621f5aebfd44c4afb1952b01a16ce3fcbc1fe086477dcf SHA512 316023781ba1b7f7732c4e898482c243ad0c487b19ddbb6f0db668f1fed64892367d4a88d8aae8dc99336900fa33d0cab1b2d7ec0070f1187d03e58b79bb636b
DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.11.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.12.ebuild vendored
View File

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

@ -19,7 +19,7 @@ else
else
MY_PV="$PV"
fi
DOCKER_GITCOMMIT="1d3ea1a"
DOCKER_GITCOMMIT="229340e"
SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild vendored
View File

@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image.
RDEPEND="
~app-emulation/docker-19.03.11
~app-emulation/docker-19.03.12
~app-emulation/containerd-1.3.4
~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0_rc90

4
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.20 vendored
View File

@ -2,10 +2,10 @@ DEFINED_PHASES=install
DEPEND=virtual/pkgconfig
DESCRIPTION=etcd (System Application Container)
EAPI=6
HOMEPAGE=https://github.com/coreos/etcd
HOMEPAGE=https://github.com/etcd-io/etcd
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=>=app-emulation/rkt-1.9.1[rkt_stage1_fly]
SLOT=0
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=f245479b41a5278f51564012f1daa1e5
_md5_=0d9c84ab11cc3f166f2e3c615ebaceb2

2
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.6.2-r1 vendored
View File

@ -10,4 +10,4 @@ REQUIRED_USE=go_version_go1_13
RESTRICT=strip
SLOT=0
_eclasses_=coreos-go 95797abfe5c87b4e2eccc42269b4cee7 coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=fb5d8ab3b41cd2f4c59840944cad07ff
_md5_=55467a492e364c35d2b86697abd99cfe

2
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999 vendored
View File

@ -10,4 +10,4 @@ REQUIRED_USE=go_version_go1_13
RESTRICT=strip
SLOT=0
_eclasses_=coreos-go 95797abfe5c87b4e2eccc42269b4cee7 coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
_md5_=fb5d8ab3b41cd2f4c59840944cad07ff
_md5_=55467a492e364c35d2b86697abd99cfe

10
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-19.03.11 → sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-19.03.12 vendored
View File

@ -1,15 +1,15 @@
DEFINED_PHASES=compile install postinst setup unpack
DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel dev-lang/go:1.12= virtual/pkgconfig virtual/pkgconfig
DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel dev-lang/go:1.13= virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=The core functions you need to create Docker images and run Docker containers
EAPI=6
HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_12 kernel_linux
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_13 kernel_linux
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 ~app-emulation/docker-runc-1.0.0_rc90[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
REQUIRED_USE=go_version_go1_12
REQUIRED_USE=go_version_go1_13
RESTRICT=installsources strip
SLOT=0
SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.11.tar.gz -> docker-19.03.11.tar.gz
SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.12.tar.gz -> docker-19.03.12.tar.gz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 udev 7752f306eec7b286d00bdb47b763e7ac user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=455d54fea90d200295069e6eeac289cd
_md5_=6baf8e8359a4cfac1e2eb965f0a777b2

8
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 vendored
View File

@ -1,14 +1,14 @@
DEFINED_PHASES=compile install postinst setup unpack
DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel >=dev-vcs/git-1.8.2.1[curl] dev-lang/go:1.12= virtual/pkgconfig virtual/pkgconfig
DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel >=dev-vcs/git-1.8.2.1[curl] dev-lang/go:1.13= virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=The core functions you need to create Docker images and run Docker containers
EAPI=6
HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_12 kernel_linux
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_13 kernel_linux
KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 ~app-emulation/docker-runc-1.0.0_rc90[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
REQUIRED_USE=go_version_go1_12
REQUIRED_USE=go_version_go1_13
RESTRICT=installsources strip
SLOT=0
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 udev 7752f306eec7b286d00bdb47b763e7ac user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=455d54fea90d200295069e6eeac289cd
_md5_=6baf8e8359a4cfac1e2eb965f0a777b2

2
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc90 vendored
View File

@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/opencontainers/runc/archive/dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz -> docker-runc-1.0.0_rc90.tar.gz
_eclasses_=coreos-go 95797abfe5c87b4e2eccc42269b4cee7 coreos-go-depend 90f5716bc80a5aea57dbb393aa0cabdf coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921
_md5_=de0f4bdc8c4e1f351a48fd8ad75e7999
_md5_=9f51171b6bfc2b732c341bf0cff10b74

4
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-19.03 vendored
View File

@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
EAPI=2
KEYWORDS=amd64 arm64
LICENSE=GPL-2
RDEPEND=~app-emulation/docker-19.03.11 ~app-emulation/containerd-1.3.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc90 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
RDEPEND=~app-emulation/docker-19.03.12 ~app-emulation/containerd-1.3.4 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc90 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0
SLOT=0
_md5_=cac7564692cebdf77df66226199204fc
_md5_=2fae9b959ded4db45a6075258e9dbfe1

4
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.38-r5 → sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.38-r6 vendored
View File

@ -5,6 +5,6 @@ EAPI=5
IUSE=cros_workon_tree_ profiling cros-debug
KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
SLOT=0/0.0.38-r5
SLOT=0/0.0.38-r6
_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=701452462c87b94e4679a7df24821f02
_md5_=859688a68defbe83bf98c5770b9f3872

2
sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 vendored
View File

@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
SLOT=0/9999
_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=701452462c87b94e4679a7df24821f02
_md5_=859688a68defbe83bf98c5770b9f3872