From 0266b6232085695a65078c99367942fb80423a24 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 17 Nov 2018 02:15:06 +0000 Subject: [PATCH 1/4] app-torcx/docker: Omit Docker package revisions from dependencies Docker's related packages are pinned to the specific versions that upstream bundles with each release. Since our revision bumps are typically only for backporting patches or changing configuration in those same versions, we don't need to explicitly depend on their revisions. This still leaves the revision dependencies for ltdl and tini since we handle those a bit differently, and this will require special attention for package changes. --- .../app-emulation/containerd/containerd-0.2.6.ebuild | 2 +- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../app-emulation/docker/docker-1.12.6-r8.ebuild | 4 ++-- .../app-emulation/docker/docker-17.03.2-r1.ebuild | 6 +++--- .../app-emulation/docker/docker-9999.ebuild | 6 +++--- .../coreos-overlay/app-torcx/docker/docker-1.12.ebuild | 6 +++--- .../coreos-overlay/app-torcx/docker/docker-17.03.ebuild | 8 ++++---- .../coreos-overlay/app-torcx/docker/docker-18.06.ebuild | 8 ++++---- .../metadata/md5-cache/app-emulation/containerd-0.2.6 | 4 ++-- .../metadata/md5-cache/app-emulation/containerd-1.1.2-r1 | 4 ++-- .../metadata/md5-cache/app-emulation/containerd-9999 | 4 ++-- .../metadata/md5-cache/app-emulation/docker-1.12.6-r8 | 4 ++-- .../metadata/md5-cache/app-emulation/docker-17.03.2-r1 | 4 ++-- .../metadata/md5-cache/app-emulation/docker-18.06.1-r2 | 4 ++-- .../metadata/md5-cache/app-emulation/docker-9999 | 4 ++-- .../metadata/md5-cache/app-torcx/docker-1.12 | 4 ++-- .../metadata/md5-cache/app-torcx/docker-17.03 | 4 ++-- .../metadata/md5-cache/app-torcx/docker-18.06 | 4 ++-- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.6.ebuild index 1bb88241de..a7d7e64cdf 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.6.ebuild @@ -21,7 +21,7 @@ SLOT="0" IUSE="hardened +seccomp" DEPEND="" -RDEPEND=">=app-emulation/docker-runc-1.0.0_rc2 +RDEPEND="~app-emulation/docker-runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp )" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index e8ae2f0fa6..82678e4f8f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -29,7 +29,7 @@ SLOT="0" IUSE="+btrfs hardened" DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="=app-emulation/docker-runc-1.0.0_rc5_p19-r1 +RDEPEND="~app-emulation/docker-runc-1.0.0_rc5_p19 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild index cc65d78483..46314492a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r8.ebuild @@ -61,8 +61,8 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 - =app-emulation/containerd-0.2.5-r3[seccomp?] - =app-emulation/runc-1.0.0_rc2_p9-r1[apparmor?,seccomp?] + ~app-emulation/containerd-0.2.5[seccomp?] + ~app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?] " RESTRICT="installsources strip" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild index 926cfe73cd..29159f9758 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild @@ -62,9 +62,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 - =app-emulation/containerd-0.2.6[seccomp?] - =app-emulation/docker-runc-1.0.0_rc2_p136-r1[apparmor?,seccomp?] - =app-emulation/docker-proxy-0.8.0_p20161019 + ~app-emulation/containerd-0.2.6[seccomp?] + ~app-emulation/docker-runc-1.0.0_rc2_p136[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20161019 container-init? ( >=sys-process/tini-0.13.0 ) " diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 2f6c7ac591..a3c1decca3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -66,9 +66,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.1.2-r1 - =app-emulation/docker-runc-1.0.0_rc5_p19-r1[apparmor?,seccomp?] - =app-emulation/docker-proxy-0.8.0_p20180709 + ~app-emulation/containerd-1.1.2 + ~app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) " diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild index 13ddffa942..fdc2701eda 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild @@ -11,9 +11,9 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-1.12.6-r8 - =app-emulation/containerd-0.2.5-r3 - =app-emulation/runc-1.0.0_rc2_p9-r1 + ~app-emulation/docker-1.12.6 + ~app-emulation/containerd-0.2.5 + ~app-emulation/runc-1.0.0_rc2_p9 " src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.03.ebuild index d5ace0bb79..f9d827a619 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.03.ebuild @@ -11,10 +11,10 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-17.03.2-r1 - =app-emulation/containerd-0.2.6 - =app-emulation/docker-proxy-0.8.0_p20161019 - =app-emulation/docker-runc-1.0.0_rc2_p136-r1 + ~app-emulation/docker-17.03.2 + ~app-emulation/containerd-0.2.6 + ~app-emulation/docker-proxy-0.8.0_p20161019 + ~app-emulation/docker-runc-1.0.0_rc2_p136 =sys-process/tini-0.13.2 " diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild index 3e6e7594e6..ba8f4ab153 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild @@ -11,10 +11,10 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-18.06.1-r2 - =app-emulation/containerd-1.1.2-r1 - =app-emulation/docker-proxy-0.8.0_p20180709 - =app-emulation/docker-runc-1.0.0_rc5_p19-r1 + ~app-emulation/docker-18.06.1 + ~app-emulation/containerd-1.1.2 + ~app-emulation/docker-proxy-0.8.0_p20180709 + ~app-emulation/docker-runc-1.0.0_rc5_p19 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 " diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.6 index fdd5df3e22..ad435c1f1d 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.6 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.6 @@ -6,10 +6,10 @@ HOMEPAGE=https://containerd.tools IUSE=hardened +seccomp +go_version_go1_7 KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 -RDEPEND=>=app-emulation/docker-runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp ) +RDEPEND=~app-emulation/docker-runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp ) REQUIRED_USE=go_version_go1_7 RESTRICT=test SLOT=0 SRC_URI=https://github.com/docker/containerd/archive/v0.2.6.tar.gz -> containerd-0.2.6.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=3467a0d35323a97820a4787b2d8d4626 +_md5_=539991a50f3b6b8aa09619411a0e2ce3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 index 6d9a0dbf69..090d2c1bcf 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 @@ -6,10 +6,10 @@ HOMEPAGE=https://containerd.tools IUSE=+btrfs hardened +go_version_go1_10 KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 -RDEPEND==app-emulation/docker-runc-1.0.0_rc5_p19-r1 sys-libs/libseccomp +RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p19 sys-libs/libseccomp REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 SRC_URI=https://github.com/containerd/containerd/archive/v1.1.2.tar.gz -> containerd-1.1.2.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=b8001c89fde86e8168665326dc6b1a87 +_md5_=dd5472b40bdb715540eb7e083ccc8efc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 index 19cbbcc427..1baba30227 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 @@ -5,9 +5,9 @@ EAPI=6 HOMEPAGE=https://containerd.tools IUSE=+btrfs hardened +go_version_go1_10 LICENSE=Apache-2.0 -RDEPEND==app-emulation/docker-runc-1.0.0_rc5_p19-r1 sys-libs/libseccomp +RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p19 sys-libs/libseccomp REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=b8001c89fde86e8168665326dc6b1a87 +_md5_=dd5472b40bdb715540eb7e083ccc8efc diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r8 index 58cdf11ea2..65c5ecd128 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r8 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r8 @@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp +selinux vim-syntax zsh-completion +journald kernel_linux cros_workon_tree_ profiling +go_version_go1_7 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] ) journald? ( >=sys-apps/systemd-225 ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 =app-emulation/containerd-0.2.5-r3[seccomp?] =app-emulation/runc-1.0.0_rc2_p9-r1[apparmor?,seccomp?] +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] ) journald? ( >=sys-apps/systemd-225 ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 ~app-emulation/containerd-0.2.5[seccomp?] ~app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?] REQUIRED_USE=go_version_go1_7 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f7c19a1a2d89d4770384d51d45912045 +_md5_=775ca1d30f6b7495f6a3008536f0c015 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.03.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.03.2-r1 index ef4ebad843..8af05c5118 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.03.2-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.03.2-r1 @@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux kernel_linux cros_workon_tree_ profiling +go_version_go1_7 KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 -RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) journald? ( >=sys-apps/systemd-225 ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 =app-emulation/containerd-0.2.6[seccomp?] =app-emulation/docker-runc-1.0.0_rc2_p136-r1[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20161019 container-init? ( >=sys-process/tini-0.13.0 ) +RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) journald? ( >=sys-apps/systemd-225 ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 ~app-emulation/containerd-0.2.6[seccomp?] ~app-emulation/docker-runc-1.0.0_rc2_p136[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20161019 container-init? ( >=sys-process/tini-0.13.0 ) REQUIRED_USE=go_version_go1_7 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 cros-workon 4ad6e6491a1010ad7c875302b3be18ba desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=82756a565e4e6a5a36e2d0c68c0ff3fc +_md5_=9b00f82dc17c48c068b17487b11d7b7d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 index e68a666976..c3485a28a3 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 @@ -6,10 +6,10 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 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 ) !app-emulation/docker-bin >=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-r1 =app-emulation/docker-runc-1.0.0_rc5_p19-r1[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) +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 ) !app-emulation/docker-bin >=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_rc5_p19[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz -> docker-18.06.1.tar.gz _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 -_md5_=eafded41121f03e12805637b01668eeb +_md5_=cfb98de11903fa79370d55df5bf58bb8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 index a96fa2e964..28519e3ffe 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 @@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 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 ) !app-emulation/docker-bin >=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-r1 =app-emulation/docker-runc-1.0.0_rc5_p19-r1[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) +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 ) !app-emulation/docker-bin >=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_rc5_p19[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=eafded41121f03e12805637b01668eeb +_md5_=cfb98de11903fa79370d55df5bf58bb8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-1.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-1.12 index 68b18fdf58..ad9b980d53 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-1.12 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-1.12 @@ -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-1.12.6-r8 =app-emulation/containerd-0.2.5-r3 =app-emulation/runc-1.0.0_rc2_p9-r1 +RDEPEND=~app-emulation/docker-1.12.6 ~app-emulation/containerd-0.2.5 ~app-emulation/runc-1.0.0_rc2_p9 SLOT=0 -_md5_=efe1b9c718e9b537247c3d67b65380ea +_md5_=c6e4e5609ec9b13b16f077edf3047b31 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.03 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.03 index c1d2ec76c0..c985d2ea3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.03 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.03 @@ -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-17.03.2-r1 =app-emulation/containerd-0.2.6 =app-emulation/docker-proxy-0.8.0_p20161019 =app-emulation/docker-runc-1.0.0_rc2_p136-r1 =sys-process/tini-0.13.2 +RDEPEND=~app-emulation/docker-17.03.2 ~app-emulation/containerd-0.2.6 ~app-emulation/docker-proxy-0.8.0_p20161019 ~app-emulation/docker-runc-1.0.0_rc2_p136 =sys-process/tini-0.13.2 SLOT=0 -_md5_=2c70db8f7c0e8d599286f9f7e5a655db +_md5_=f54bd65385448e51b1040cd5060e3a1a diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 index 030c59df7b..221264ca1c 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 @@ -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-18.06.1-r2 =app-emulation/containerd-1.1.2-r1 =app-emulation/docker-proxy-0.8.0_p20180709 =app-emulation/docker-runc-1.0.0_rc5_p19-r1 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 +RDEPEND=~app-emulation/docker-18.06.1 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p19 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 SLOT=0 -_md5_=979436c9e02108fadacf37f9507d1da9 +_md5_=7c3778fd05568b1e67ffb321ce9686fc From 630c61b915929d50b0a91d6c538ec23bded561e8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Feb 2019 16:47:57 +0000 Subject: [PATCH 2/4] app-emulation/docker-runc: Bump the 18.06 snapshot to 18.06.2 --- .../coreos-overlay/app-emulation/docker-runc/Manifest | 4 ++-- ..._p19-r1.ebuild => docker-runc-1.0.0_rc5_p22.ebuild} | 10 ++++++---- ...runc-1.0.0_rc5_p19-r1 => docker-runc-1.0.0_rc5_p22} | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/{docker-runc-1.0.0_rc5_p19-r1.ebuild => docker-runc-1.0.0_rc5_p22.ebuild} (81%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-runc-1.0.0_rc5_p19-r1 => docker-runc-1.0.0_rc5_p22} (85%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest index ce795bcaf4..4747e0f6d9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest @@ -1,2 +1,2 @@ -DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 SHA256 2954cb6b468b3806a08c45656acc2019035bc9994c2a9b4249cfde4d9b3a7c93 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 WHIRLPOOL ede821987006a54e7a87f88d9a5104d4a4ecc05a614e111fefa669f5ae436c11004debfe919bec0808194f2d96442775718a0208a1a374a9dd56a896f7dd8640 -DIST docker-runc-1.0.0_rc5_p19.tar.gz 1185576 SHA256 994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 WHIRLPOOL 354a12c1758ee499c850e3e4efb3d8eacbbc54649dad11d2d259b28ff8220e47fd97f406dfa15d98f688e5dfe79c78452e451b5d50be745b57fe620acb24f98e +DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 +DIST docker-runc-1.0.0_rc5_p22.tar.gz 1187716 BLAKE2B 008401c389b0db1aed63f7044ca51bb681d5498358eedac98b6103dd75d3c44ef9f9d3dcd60f01b7ecb5d4a5420efc8ed737acf95d62b439abb10ae0b50a7aa7 SHA512 4b45d5f899ece2c017e93bdb211436ccea84c14ac99f3104baa5728b188536d390036f0defd40dab9514a529e48f39d093cbcc15fa98012e70c8e4f560168f9f diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild index 2c591c656a..628326dbbf 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p22.ebuild @@ -7,12 +7,14 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.10" # the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v18.06.1-ce/components/engine/hack/dockerfile/install/runc.installer#L4 +# see https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/engine/hack/dockerfile/install/runc.installer#L5 # 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: # $ git log --oneline v1.0.0-rc5..${COMMIT_ID} | wc -l -COMMIT_ID="69663f0bd4b60df09991c08812a60108003fa340" +COMMIT_ID="a592beb5bc4c4092b1b1bac971afed27687340c5" +# This is the expected commit ID, which ignores the patch in the commit above. +RUNC_COMMIT="69663f0bd4b60df09991c08812a60108003fa340" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -43,7 +45,6 @@ src_unpack() { PATCHES=( "${FILESDIR}/0001-Delay-unshare-of-clone-newipc-for-selinux.patch" - "${FILESDIR}/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch" ) src_compile() { @@ -61,7 +62,8 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - COMMIT="${COMMIT_ID}" + VERSION=1.0.0-rc5+dev.docker-18.06 \ + COMMIT="${RUNC_COMMIT}" } src_install() { diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 index 3a0899a597..cbd4321d76 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p22 @@ -10,6 +10,6 @@ RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 -SRC_URI=https://github.com/opencontainers/runc/archive/69663f0bd4b60df09991c08812a60108003fa340.tar.gz -> docker-runc-1.0.0_rc5_p19.tar.gz +SRC_URI=https://github.com/opencontainers/runc/archive/a592beb5bc4c4092b1b1bac971afed27687340c5.tar.gz -> docker-runc-1.0.0_rc5_p22.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=1d7b0d84b00b0380abbf9a5fc4261f1a +_md5_=21335b1e8685fad299934cc6bcc55f93 From d76c7f34cb2e998ed3cb41e1c9de85eb30486e8e Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Feb 2019 16:55:53 +0000 Subject: [PATCH 3/4] app-emulation/docker: Bump 18.06.1 to 18.06.2 --- .../containerd/containerd-9999.ebuild | 2 +- .../app-emulation/docker/Manifest | 2 +- ...8.06.1-r2.ebuild => docker-18.06.2.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 31 +++++-------------- ... => docker-18.06.2-fix-mount-labels.patch} | 0 .../app-emulation/containerd-1.1.2-r1 | 4 +-- .../md5-cache/app-emulation/containerd-9999 | 4 +-- .../{docker-18.06.1-r2 => docker-18.06.2} | 6 ++-- .../md5-cache/app-emulation/docker-9999 | 4 +-- 9 files changed, 18 insertions(+), 35 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.06.1-r2.ebuild => docker-18.06.2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/{docker-18.06.1-fix-mount-labels.patch => docker-18.06.2-fix-mount-labels.patch} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-18.06.1-r2 => docker-18.06.2} (77%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 82678e4f8f..d608c36d8f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -29,7 +29,7 @@ SLOT="0" IUSE="+btrfs hardened" DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="~app-emulation/docker-runc-1.0.0_rc5_p19 +RDEPEND="~app-emulation/docker-runc-1.0.0_rc5_p22 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} 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 ebc6bea489..31e6e0d319 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-18.06.1.tar.gz 13672693 BLAKE2B 7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0 SHA512 7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1 +DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index a3c1decca3..d824723118 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="e68fc7a" + DOCKER_GITCOMMIT="6d37f41" 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!" @@ -59,15 +59,13 @@ DEPEND+="sys-kernel/coreos-kernel" # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies RDEPEND=" ${CDEPEND} - - !app-emulation/docker-bin >=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_rc5_p19[apparmor?,seccomp?] + ~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) " @@ -87,8 +85,8 @@ CONFIG_CHECK=" ~KEYS ~VETH ~BRIDGE ~BRIDGE_NETFILTER ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NF_NAT ~NF_NAT_NEEDED + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED ~POSIX_MQUEUE ~USER_NS @@ -104,7 +102,7 @@ CONFIG_CHECK=" ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR ~VXLAN - ~XFRM_ALGO ~XFRM_USER + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER ~IPVLAN ~MACVLAN ~DUMMY " @@ -127,21 +125,6 @@ pkg_setup() { ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" fi - # for where these kernel versions come from, see: - # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* - if ! { - kernel_is ge 3 16 \ - || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ - || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ - || { kernel_is 3 12 && kernel_is ge 3 12 25; } - }; then - ewarn "" - ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" - ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" - ewarn "" - ewarn "See also https://github.com/docker/docker/issues/2960" - fi - if kernel_is le 3 18; then CONFIG_CHECK+=" ~RESOURCE_COUNTERS @@ -267,7 +250,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.06.1-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.06.2-ce/components/cli/scripts/build/.variables#L7 CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')" # build cli emake \ diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.1-fix-mount-labels.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.1-fix-mount-labels.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker-18.06.2-fix-mount-labels.patch diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 index 090d2c1bcf..5d52e86c51 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2-r1 @@ -6,10 +6,10 @@ HOMEPAGE=https://containerd.tools IUSE=+btrfs hardened +go_version_go1_10 KEYWORDS=amd64 arm64 LICENSE=Apache-2.0 -RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p19 sys-libs/libseccomp +RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p22 sys-libs/libseccomp REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 SRC_URI=https://github.com/containerd/containerd/archive/v1.1.2.tar.gz -> containerd-1.1.2.tar.gz _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 -_md5_=dd5472b40bdb715540eb7e083ccc8efc +_md5_=632708dae81ffaedd9e9bf0aacdaa7b2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 index 1baba30227..37bd5e73cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-9999 @@ -5,9 +5,9 @@ EAPI=6 HOMEPAGE=https://containerd.tools IUSE=+btrfs hardened +go_version_go1_10 LICENSE=Apache-2.0 -RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p19 sys-libs/libseccomp +RDEPEND=~app-emulation/docker-runc-1.0.0_rc5_p22 sys-libs/libseccomp REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 _eclasses_=coreos-go e0b9bd13413783cf7a2859afc20534a2 coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=dd5472b40bdb715540eb7e083ccc8efc +_md5_=632708dae81ffaedd9e9bf0aacdaa7b2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 similarity index 77% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 index c3485a28a3..14a62976af 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1-r2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.2 @@ -6,10 +6,10 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 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 ) !app-emulation/docker-bin >=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_rc5_p19[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) +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_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 -SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.1-ce.tar.gz -> docker-18.06.1.tar.gz +SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.2-ce.tar.gz -> docker-18.06.2.tar.gz _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 -_md5_=cfb98de11903fa79370d55df5bf58bb8 +_md5_=c3a5af7398c78c523941960cf21044c0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 index 28519e3ffe..7df91cbc94 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 @@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 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 ) !app-emulation/docker-bin >=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_rc5_p19[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) +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_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) REQUIRED_USE=go_version_go1_10 RESTRICT=installsources strip SLOT=0 _eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb coreos-go-depend cec6567f1c69a9b3e529a49eedaeed55 coreos-go-utils 67004337b6f831adc5f1ff107ee2f157 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=cfb98de11903fa79370d55df5bf58bb8 +_md5_=c3a5af7398c78c523941960cf21044c0 From 14b25b946ea540623b61ed7bf85334ce1395a9c9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Feb 2019 16:57:29 +0000 Subject: [PATCH 4/4] app-torcx/docker: Bump the 18.06 image to 18.06.2 --- .../coreos-overlay/app-torcx/docker/docker-18.06.ebuild | 4 ++-- .../coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild index ba8f4ab153..7e7ebd86ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild @@ -11,10 +11,10 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - ~app-emulation/docker-18.06.1 + ~app-emulation/docker-18.06.2 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 - ~app-emulation/docker-runc-1.0.0_rc5_p19 + ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 " diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 index 221264ca1c..929472d7ed 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06 @@ -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-18.06.1 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p19 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 +RDEPEND=~app-emulation/docker-18.06.2 ~app-emulation/containerd-1.1.2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 SLOT=0 -_md5_=7c3778fd05568b1e67ffb321ce9686fc +_md5_=241e7dcf9a37d5a68340b057d5f0c8e6