From 47c7761576d8e69cab8944f833f97bcdfed32362 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:39:00 -0500 Subject: [PATCH 1/5] app-emulation/docker-runc: Drop the Docker 17.12.0 version --- .../app-emulation/docker-runc/Manifest | 1 - .../docker-runc-1.0.0_rc4_p171.ebuild | 72 ------------------- .../app-emulation/docker-runc-1.0.0_rc4_p171 | 15 ---- 3 files changed, 88 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p171.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p171 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 c1dbb60bae..92aaf090c7 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,3 +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_rc4_p171.tar.gz 1189298 SHA256 0838504b63fe8c2055c8307cd9f9d5e79d96c03ac86069fba3b9bc7fa459502b SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695 WHIRLPOOL f0264dc7e5319ed1cd44db3ee2d7f37fe1476f1827f71fc3ee5e9fb45ef139f5e72b31a1f7e402c2e3a595524b1fd96d6a5175c379f78130c54d53a1e26a0bca DIST docker-runc-1.0.0_rc4_p205.tar.gz 1184954 SHA256 fa9854008f64f71b798ca63aed5be774aa432888bfda0d3ec60f2571647af156 SHA512 c7b24ca6212ce500d1d4c3a1776be5ca116d4f005d71e5fe8f2228c26f039058f3dd1071e9e39aa9c93272a49f7ff2ac86e2fbbcf6115cc3de65a370127d8ea5 WHIRLPOOL c9396ddd948672d59287eb4e07053a1af7e74fa82c1b687e489850ab3dce91ebed8bc0af16b25ddbe8452adeb8ccf46fbc941f368cdc7a889662becfcbd7928a diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p171.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p171.ebuild deleted file mode 100644 index d5e4d1541c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p171.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GITHUB_URI="github.com/opencontainers/runc" -COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.8" -# the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v17.12.0-ce/components/engine/hack/dockerfile/binaries-commits#L6 -# Note: this commit is only really present in the `docker/runc` repository. -# 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 -# spcified in the ebuild name. For example: -# $ git log --oneline v1.0.0-rc4..${COMMIT_ID} | wc -l -COMMIT_ID="b2567b37d7b75eb4cf325b77297b140ea686ce8f" - -inherit eutils flag-o-matic coreos-go vcs-snapshot - -SRC_URI="https://${GITHUB_URI}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 arm64" - -DESCRIPTION="runc container cli tools (docker fork)" -HOMEPAGE="http://runc.io" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="ambient apparmor hardened +seccomp selinux" - -RDEPEND=" - apparmor? ( sys-libs/libapparmor ) - seccomp? ( sys-libs/libseccomp ) - !app-emulation/runc -" - -S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} - -RESTRICT="test" - -src_unpack() { - mkdir -p "${S}" - tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" -} - -PATCHES=( - "${FILESDIR}/0001-Delay-unshare-of-clone-newipc-for-selinux.patch" -) - -src_compile() { - # Taken from app-emulation/docker-1.7.0-r1 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '') - -L${ROOT}/usr/$(get_libdir)" - - # build up optional flags - local options=( - $(usex ambient 'ambient' '') - $(usex apparmor 'apparmor' '') - $(usex seccomp 'seccomp' '') - $(usex selinux 'selinux' '') - ) - - # CoreOS: Don't try to install dependencies. - sed -i 's/go build -i /go build /' Makefile - - GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - COMMIT="${COMMIT_ID}" -} - -src_install() { - dobin runc -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p171 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p171 deleted file mode 100644 index 159684f6d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p171 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile install prepare unpack -DEPEND=dev-lang/go:1.8= -DESCRIPTION=runc container cli tools (docker fork) -EAPI=6 -HOMEPAGE=http://runc.io -IUSE=ambient apparmor hardened +seccomp selinux +go_version_go1_8 -KEYWORDS=amd64 arm64 -LICENSE=Apache-2.0 -RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/runc -REQUIRED_USE=go_version_go1_8 -RESTRICT=test -SLOT=0 -SRC_URI=https://github.com/opencontainers/runc/archive/b2567b37d7b75eb4cf325b77297b140ea686ce8f.tar.gz -> docker-runc-1.0.0_rc4_p171.tar.gz -_eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e toolchain-funcs 185a06792159ca143528e7010368e8af vcs-snapshot 03289f51c769cf409d200d2d628cdd6e -_md5_=a187d37989e8437ff96ec8275c4d405a From bfabdd7b7988e8e410a610e9b756b030551f00c5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:42:03 -0500 Subject: [PATCH 2/5] app-emulation/containerd: Drop the Docker 17.12.0 version --- .../app-emulation/containerd/Manifest | 1 - .../containerd/containerd-1.0.0.ebuild | 54 ------------------- .../md5-cache/app-emulation/containerd-1.0.0 | 14 ----- 3 files changed, 69 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.0 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest index dc44e5a2ec..d921fa830b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/Manifest @@ -1,4 +1,3 @@ DIST containerd-0.2.5.tar.gz 1003500 SHA256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f WHIRLPOOL eb3622ba99c4d4806bda9a45853422a5b0b884869ed3be4c3caec4c20f49027e8db78b9885eca7bc83a0f3b08e9a66eca950390f0eda1ef2535fd3ab41623bf4 DIST containerd-0.2.6.tar.gz 1020572 SHA256 a67c4153ac5ae26b9d11daac133b90cba059ba16de7579e39c3e82bcda856493 SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 WHIRLPOOL 98f64c888ea580074e51b91311ab186291cb2d3ecc9f178d828687dbb60b35104237041699b6125cf026edd245459a052fda1801ac3cd7e1efe34606c3d9a4eb -DIST containerd-1.0.0.tar.gz 3763785 SHA256 874720e68140cf57c7a4997cdab0b8177ad2ddb89e6332bb4f0ba23699a321fd SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a WHIRLPOOL 73ec169ed5529bbc7963e859f1a19497fd45d80352be94fef678a51066689c877a82bc97179aa53cc75bb363d251c3d09e5ce43a693522f08cc19b11bf9b7db1 DIST containerd-1.0.1.tar.gz 3766659 SHA256 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 WHIRLPOOL 29823ab7fed5ec3832644faa77256c5dfdb0ce61496f20848bb4aca1d25f25b318df5539dbad2794497fa27c9100cd85f088419674f2a8a28f937efc4cdab6ef diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild deleted file mode 100644 index 00cfa1c82a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GITHUB_URI="github.com/containerd/containerd" -COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.9" - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://${GITHUB_URI}.git" - inherit git-r3 -else - MY_PV="${PV/_rc/-rc.}" - EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="89623f28b87a6004d4b785663257362d1658a729" - SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" - inherit vcs-snapshot - MAKE_VERSION_ARGS="REVISION=${CONTAINERD_COMMIT} VERSION=v${PV}" -fi - -inherit coreos-go systemd - -DESCRIPTION="A daemon to control runC" -HOMEPAGE="https://containerd.tools" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened +seccomp" - -DEPEND="" -RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p171 - seccomp? ( sys-libs/libseccomp )" - -S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} - -src_unpack() { - mkdir -p "${S}" - tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}" -} - -src_compile() { - local options=( $(usex seccomp "seccomp" "") ) - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake ${MAKE_VERSION_ARGS} BUILDTAGS="${options[@]}" -} - -src_install() { - dobin bin/containerd{-shim,-stress,} bin/ctr - systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service" - insinto /usr/share/containerd - doins "${FILESDIR}/config.toml" -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.0 deleted file mode 100644 index f127d277d1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install prepare unpack -DEPEND=dev-lang/go:1.9= virtual/pkgconfig -DESCRIPTION=A daemon to control runC -EAPI=6 -HOMEPAGE=https://containerd.tools -IUSE=hardened +seccomp +go_version_go1_9 -KEYWORDS=amd64 arm64 -LICENSE=Apache-2.0 -RDEPEND==app-emulation/docker-runc-1.0.0_rc4_p171 seccomp? ( sys-libs/libseccomp ) -REQUIRED_USE=go_version_go1_9 -SLOT=0 -SRC_URI=https://github.com/containerd/containerd/archive/89623f28b87a6004d4b785663257362d1658a729.tar.gz -> containerd-1.0.0.tar.gz -_eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af vcs-snapshot 03289f51c769cf409d200d2d628cdd6e -_md5_=fb573da34cb6f48b489b40b33c01ea95 From 6d0aad564c4fed0b62ecebd2982a7f6ff81da968 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:53:18 -0500 Subject: [PATCH 3/5] app-emulation/docker: Bump 17.12.0 to 17.12.1 --- .../coreos-overlay/app-emulation/docker/Manifest | 2 +- .../{docker-17.12.0.ebuild => docker-17.12.1.ebuild} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.12.0.ebuild => docker-17.12.1.ebuild} (97%) 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 c495fdd5a6..06b9a3b97b 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,2 +1,2 @@ -DIST docker-17.12.0.tar.gz 11008332 SHA256 1303483c878ded1c0e19f323f04316cef6d4c0c895f85c412af6468647d18ef9 SHA512 7381bddf4b2538b2b76229d962925eee74a38ddbb18a6f988ccff2a2ce0ef334148ea76d9697e89acc6c9018cb6f785b59c27450dfb930ead01fa5684c6a90b1 WHIRLPOOL 1d9ee9131fc2a9dc53369a67d83a29d1f9f6dec3d66942ae17a5fabd455e5de24456aaaf2d21458854532174d5623c9116c8478f7c0af1447fa8d89653854fc6 +DIST docker-17.12.1.tar.gz 11046888 SHA256 e4b58c26c05a800d96d3e5d76375654751d4d1367b5727c798369cf3c78a590e SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7 WHIRLPOOL 218d61a35648b1b58ec0c4f63bbb06695b4739469bcfdf84745886085f1eca5472b59da35514d35f4835bec388b79109dd3c8bd449e86a3dffabb6c9e865d623 DIST docker-18.02.0.tar.gz 12659242 SHA256 fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 SHA512 4d1bd0ffc893e70fc524f46cacdc4ab035d8b7e0fd7e8de9faf6d9c30b9920b68a99764101e47a8375425b774fe93c317213509b2d1ace87c7598b2b939b849b WHIRLPOOL 6e09cb54bde84c9d901b63c36c1a130badb8d23cd28930b636e7321302bf2e9765763c7f2e76faad5fc170f6ea6210de47c5c70d01e5cd224d4978cfe55cbee9 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild index eabf24664b..00e5b8af38 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="c97c6d6" + DOCKER_GITCOMMIT="7390fc6" 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!" @@ -64,9 +64,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.0.0[seccomp?] - =app-emulation/docker-runc-1.0.0_rc4_p171[apparmor?,seccomp?] - app-emulation/docker-proxy + =app-emulation/containerd-1.0.1 + =app-emulation/docker-runc-1.0.0_rc4_p205[apparmor?,seccomp?] + =app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.13.1 ) " @@ -263,7 +263,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v17.12.0-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v17.12.1-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 \ From 993da630ef8e42c52ebea8b12b31b8ab19997109 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:56:52 -0500 Subject: [PATCH 4/5] app-torcx/docker: Bump the 17.12 image to 17.12.1 --- .../coreos-overlay/app-torcx/docker/docker-17.12.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.12.ebuild index b7950cf29f..abd2bb585f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.12.ebuild @@ -11,17 +11,17 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-17.12.0 - =app-emulation/containerd-1.0.0 + =app-emulation/docker-17.12.1 + =app-emulation/containerd-1.0.1 =app-emulation/docker-proxy-0.8.0_p20170917 - =app-emulation/docker-runc-1.0.0_rc4_p171 + =app-emulation/docker-runc-1.0.0_rc4_p205 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 " src_install() { insinto /.torcx - newins "${FILESDIR}/${PN}-${PV}-manifest.json" manifest.json + newins "${FILESDIR}/${P}-manifest.json" manifest.json # Enable the Docker socket by default. local unitdir=/usr/lib/systemd/system From 90823deb9a7d2bd03b584afdc743dae9787c8e81 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:59:34 -0500 Subject: [PATCH 5/5] chore(metadata): Regenerate cache --- .../metadata/md5-cache/app-emulation/containerd-1.0.1 | 4 ++-- .../metadata/md5-cache/app-emulation/containerd-9999 | 2 +- .../app-emulation/{docker-17.12.0 => docker-17.12.1} | 6 +++--- .../metadata/md5-cache/app-torcx/docker-17.12 | 4 ++-- .../{coreos-kernel-4.14.19 => coreos-kernel-4.14.22} | 6 +++--- .../{coreos-kernel-4.15.3 => coreos-kernel-4.15.6} | 6 +++--- .../{coreos-modules-4.14.19 => coreos-modules-4.14.22} | 4 ++-- .../{coreos-modules-4.15.3 => coreos-modules-4.15.6} | 4 ++-- .../{coreos-sources-4.14.19 => coreos-sources-4.14.22} | 6 +++--- .../{coreos-sources-4.15.3 => coreos-sources-4.15.6} | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-17.12.0 => docker-17.12.1} (82%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.14.19 => coreos-kernel-4.14.22} (85%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-kernel-4.15.3 => coreos-kernel-4.15.6} (85%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.14.19 => coreos-modules-4.14.22} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.15.3 => coreos-modules-4.15.6} (93%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.14.19 => coreos-sources-4.14.22} (88%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.15.3 => coreos-sources-4.15.6} (92%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.1 index bcd19616c5..334834621b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.1 @@ -9,6 +9,6 @@ LICENSE=Apache-2.0 RDEPEND==app-emulation/docker-runc-1.0.0_rc4_p205 sys-libs/libseccomp REQUIRED_USE=go_version_go1_9 SLOT=0 -SRC_URI=https://github.com/containerd/containerd/archive/9b55aab90508bd389d7654c4baf173a981477d55.tar.gz -> containerd-1.0.1.tar.gz +SRC_URI=https://github.com/containerd/containerd/archive/v1.0.1.tar.gz -> containerd-1.0.1.tar.gz _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af vcs-snapshot 03289f51c769cf409d200d2d628cdd6e -_md5_=8294adf8c3b5ddd12883d7990b344d07 +_md5_=5ab9cd8d457470d8d4549d3645e182bd 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 80a630b475..361b2ec554 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 @@ -9,4 +9,4 @@ RDEPEND==app-emulation/docker-runc-1.0.0_rc4_p205 sys-libs/libseccomp REQUIRED_USE=go_version_go1_9 SLOT=0 _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=8294adf8c3b5ddd12883d7990b344d07 +_md5_=5ab9cd8d457470d8d4549d3645e182bd diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.1 similarity index 82% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.1 index 7c3b4fec02..f46d3e3fe9 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.12.1 @@ -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_9 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.0.0[seccomp?] =app-emulation/docker-runc-1.0.0_rc4_p171[apparmor?,seccomp?] app-emulation/docker-proxy 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.0.1 =app-emulation/docker-runc-1.0.0_rc4_p205[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.13.1 ) REQUIRED_USE=go_version_go1_9 RESTRICT=installsources strip SLOT=0 -SRC_URI=https://github.com/docker/docker-ce/archive/v17.12.0-ce.tar.gz -> docker-17.12.0.tar.gz +SRC_URI=https://github.com/docker/docker-ce/archive/v17.12.1-ce.tar.gz -> docker-17.12.1.tar.gz _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=1ed08b8a56629168a6895c9aa02e1b14 +_md5_=83c0a9cbe9dc5f5aa7801fefc2a2391d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.12 index 3451e5012c..72ba07b23b 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.12 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-17.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-17.12.0 =app-emulation/containerd-1.0.0 =app-emulation/docker-proxy-0.8.0_p20170917 =app-emulation/docker-runc-1.0.0_rc4_p171 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 +RDEPEND==app-emulation/docker-17.12.1 =app-emulation/containerd-1.0.1 =app-emulation/docker-proxy-0.8.0_p20170917 =app-emulation/docker-runc-1.0.0_rc4_p205 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2 SLOT=0 -_md5_=5f7647876eb4de6a5ac2a980520768e9 +_md5_=4a2a4a39bfe355fbb199ced8384488fe diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.22 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.19 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.22 index b3e527a396..e6ca1af56d 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.19 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.22 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.14.19 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.14.19 +DEPEND==sys-kernel/coreos-modules-4.14.22 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.14.22 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.14.19 +RDEPEND==sys-kernel/coreos-modules-4.14.22 RESTRICT=binchecks strip -SLOT=0/4.14.19 +SLOT=0/4.14.22 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=3e4e3373c05c9f190b12d6c0c9520669 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.6 similarity index 85% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.3 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.6 index 31f7b0114d..58d5768c4a 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.3 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.15.6 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare pretend setup unpack -DEPEND==sys-kernel/coreos-modules-4.15.3 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.15.3 +DEPEND==sys-kernel/coreos-modules-4.15.6 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.15.6 DESCRIPTION=CoreOS Linux kernel EAPI=5 HOMEPAGE=http://www.kernel.org KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.15.3 +RDEPEND==sys-kernel/coreos-modules-4.15.6 RESTRICT=binchecks strip -SLOT=0/4.15.3 +SLOT=0/4.15.6 _eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=3e4e3373c05c9f190b12d6c0c9520669 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.22 similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.19 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.22 index ddc6d8f526..c2c4c9b645 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.19 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.22 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.14.19 +DEPEND==sys-kernel/coreos-sources-4.14.22 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.14.19 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz +SLOT=4.14.22 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.22.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=f614ac0f1795ccc8a0fe92563706bd0a +_md5_=a2616c4d5e90728d4dfce9f7c78cfe82 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.6 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.3 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.6 index 4943a13cb6..898d47dbaa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.3 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.15.6 @@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) RESTRICT=binchecks strip -SLOT=4.15.3 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.3.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz +SLOT=4.15.6 +SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _md5_=3b1ad86e253a7863f7348bc9ea0ade87