From 55bbed0dba34f2a967b048ac2cd71b3adf37f813 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 22 Aug 2018 00:13:00 +0000 Subject: [PATCH 1/3] app-emulation/containerd: Bump to 1.1.2 for Docker 18.06.1 --- .../coreos-overlay/app-emulation/containerd/Manifest | 6 +++--- .../{containerd-1.1.1.ebuild => containerd-1.1.2.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../app-emulation/{containerd-1.1.1 => containerd-1.1.2} | 4 ++-- .../metadata/md5-cache/app-emulation/containerd-9999 | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.1.1.ebuild => containerd-1.1.2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{containerd-1.1.1 => containerd-1.1.2} (89%) 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 777ffabd1f..d60a50c6f6 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,3 +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.1.1.tar.gz 5123253 SHA256 2901e3f6113ea97850ec9ac5640db0273c7f10e887701f7da2cf3ae1a730934e SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd WHIRLPOOL d7ca0c6d698f0452fbb66ec1660e97fe0dc0a57de1c31bece12b8c42b4eb0a6ce622a3dd4b10de703d207839a31f594ffd9bedc10ace25068118b42766db59e8 +DIST containerd-0.2.5.tar.gz 1003500 BLAKE2B ef08782b068e1d81df34881bdd156e7aa387d2710aee9b9c3b05a3d7cb018b7f78aab0aec77640823d8976636265e18ffc69abc25a4c326180b2c18c00059a4c SHA512 ba1e074bb7556a7c4be4d68dc62aa2fa4b823682c209d1609c1f11518a7b7167139ea159d31e0b21ba190d83115a67e5e45b54b6a4770742d49e9e561309551f +DIST containerd-0.2.6.tar.gz 1020572 BLAKE2B b235acc5badd3c3d87f72910c11e6adfd73e2cb7aa5273ab0ed9e6642aff8980d9b2a74875b4a69db36eaf67350124ef8629b0f460bdbe2d16d1ab834ba1e2cc SHA512 41018bda556a3ddfb1bd3a16e642548ba06f413b13fd1488e731896e277ba6c84a393ebd5de067ecaeccc695297a2b74edf22e5a3fe8f2e3eadf78d080bdeff6 +DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2.ebuild 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 47f1d42c75..da762188b2 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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then else MY_PV="${PV/_rc/-rc.}" EGIT_COMMIT="v${MY_PV}" - CONTAINERD_COMMIT="d64c661f1d51c48782c9cec8fda7604785f93587" + CONTAINERD_COMMIT="468a545b9edcd5932818eb9de8e72413e616e86e" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2 similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2 index adbec87474..642ab1c094 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.2 @@ -10,6 +10,6 @@ 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.1.tar.gz -> containerd-1.1.1.tar.gz +SRC_URI=https://github.com/containerd/containerd/archive/v1.1.2.tar.gz -> containerd-1.1.2.tar.gz _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b -_md5_=61e6af03045ddfe0a2c5a97c318b8a31 +_md5_=fa3a61c0d95a8e874331835c436d2da8 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 eb002a08bc..3e50ab9038 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 @@ -10,4 +10,4 @@ REQUIRED_USE=go_version_go1_10 RESTRICT=test SLOT=0 _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=61e6af03045ddfe0a2c5a97c318b8a31 +_md5_=fa3a61c0d95a8e874331835c436d2da8 From 7e55c2b5ed2eb78f2f62b08974e3596777013c97 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 22 Aug 2018 00:15:35 +0000 Subject: [PATCH 2/3] app-emulation/docker: Bump 18.06.0 to 18.06.1 --- .../docker-runc/docker-runc-1.0.0_rc5_p19.ebuild | 2 +- .../coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-18.06.0.ebuild => docker-18.06.1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 6 +++--- .../app-emulation/{docker-18.06.0 => docker-18.06.1} | 6 +++--- .../metadata/md5-cache/app-emulation/docker-9999 | 4 ++-- .../md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19 | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.06.0.ebuild => docker-18.06.1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/{docker-18.06.0 => docker-18.06.1} (90%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19.ebuild index 34ed8af031..701af3f356 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19.ebuild @@ -7,7 +7,7 @@ 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.0-ce/components/engine/hack/dockerfile/install/runc.installer#L4 +# see https://github.com/docker/docker-ce/blob/v18.06.1-ce/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: 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 583445afd9..ebc6bea489 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.0.tar.gz 13656557 SHA256 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501 SHA512 d5bd6a83126c4dba14c775533b6c9bda35af2cd97db13922b3766494ce10dd9316d0167c87a6683dede28ea063f9435a0a009b96e413dad8abc7884a3468d589 WHIRLPOOL 708a9ce17f440c4d2161a89b92591c82653b8d61eb7e1d72d47b389f674d92c826bf5f86daa3f770450479e8768fc8f451ee6cbc0f5ffd8585be527f8f2a0005 +DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0 SHA512 7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1.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 5d7978f66b..bd89b444f0 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 @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="0ffa825" + DOCKER_GITCOMMIT="e68fc7a" 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!" @@ -66,7 +66,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.1.1 + =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 ) @@ -265,7 +265,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.06.0-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.06.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 \ diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1 similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.1 index dd84f524cc..46eab043dd 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.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_10 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.1 =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 ) !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.0-ce.tar.gz -> docker-18.06.0.tar.gz +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 6af26c1ffe65d92d3f525cb715f6250c coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 -_md5_=166c2fb16a8b760c38941e430b5a49cf +_md5_=1ae80a87f87fbf4ed18953bb1ca864b8 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 13b87a276a..2fe12cb903 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 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.1 =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 ) !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 6af26c1ffe65d92d3f525cb715f6250c coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 -_md5_=166c2fb16a8b760c38941e430b5a49cf +_md5_=1ae80a87f87fbf4ed18953bb1ca864b8 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19 index 944d8f4c8e..9e36c381c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/opencontainers/runc/archive/69663f0bd4b60df09991c08812a60108003fa340.tar.gz -> docker-runc-1.0.0_rc5_p19.tar.gz _eclasses_=coreos-go 43a394c18570b3dd8dd6e74fc9853493 coreos-go-depend 0c1747ddda8ae24e0d2e88cdfddaa7d1 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b -_md5_=a97f141e08b4570478f7d958fcfea65d +_md5_=85f9379ee51e095f514748d1aa8c1fd4 From 2b5c9f085ae7bce51bd9288e601dc85f6dfdcdcc Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 22 Aug 2018 00:17:52 +0000 Subject: [PATCH 3/3] app-torcx/docker: Bump the 18.06 image to 18.06.1 --- .../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 ce623bab2d..ad39a84373 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,8 +11,8 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-18.06.0 - =app-emulation/containerd-1.1.1 + =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 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 273f845cb0..8dd2c8816d 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.0 =app-emulation/containerd-1.1.1 =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.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_=b82819fcd6778a78688910c2b5debee2 +_md5_=7295110afb4f2cd2064d79d3d50174e4