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 b99a51de52..777ffabd1f 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.3.tar.gz 3776722 SHA256 299e3a93eac232c1259fe058e724bfc274741b13b9de96116d1f61619bb2789e SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c WHIRLPOOL 72c6d43a9377e6c88b04b35913496197a711843962801870c53a43d55c71968ff618307827c2ddbcff12474fb9a84ae8ec61256e2f384c4c37d8c9384234c679
 DIST containerd-1.1.1.tar.gz 5123253 SHA256 2901e3f6113ea97850ec9ac5640db0273c7f10e887701f7da2cf3ae1a730934e SHA512 429070dbe0b486f8bbf5411c037e020f50fd008741091d6db1c13a0b526b2b4d0b22bb458401dd2ed142dc34e9bdcbd1ea30eabba39f11a50c294b94ce9867bd WHIRLPOOL d7ca0c6d698f0452fbb66ec1660e97fe0dc0a57de1c31bece12b8c42b4eb0a6ce622a3dd4b10de703d207839a31f594ffd9bedc10ace25068118b42766db59e8
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.3.ebuild
deleted file mode 100644
index 97b47e4ca0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.3.ebuild
+++ /dev/null
@@ -1,63 +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="773c489c9c1b21a6d78b5c538cd395416ec50f88"
-	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-	inherit vcs-snapshot
-fi
-
-inherit coreos-go systemd
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+btrfs hardened"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="=app-emulation/docker-runc-1.0.0_rc5
-	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_prepare() {
-	coreos-go_src_prepare
-	if [[ ${PV} != *9999* ]]; then
-		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-			-e "s/-s -w//" \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	local options=( $(usex btrfs "" "no_btrfs") )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake 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/app-emulation/docker-proxy/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
index fecd5245cc..0314704703 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest
@@ -1,4 +1,3 @@
 DIST docker-proxy-0.8.0_p20161019.tar.gz 2112423 SHA256 170d355ad613cc28245a6d9501bcaba930cb594a632fdd9bd52a4fa90b406932 SHA512 a7b040cdeaf15054d436b184370af0f9b23a5b6d0b2c01530b7ad539040186888bb030309e18a1a02ad252753cf4f08aa5e5ec504480a8ffb7050db76764db5b WHIRLPOOL 83fed4162e1fbe2a640dfb720ca85583f923166d0f7da3e397ec20a333dddc42d7def2231de8877569cb63bb37435d23f772413ffd6d82f8a4a8c453d75f669c
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 SHA256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd WHIRLPOOL 27b33b36bbdeaff3d25977b50aa11fc5a4708482f44efe583223c1aab40091e28824eda6eb5ac8a7f20be24ef4ddcf9b6e4a043c52c9e6953ec2c95f266fb296
-DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 SHA256 117d31c100eaa50468050015a94fd2e326e59fb22c50285b794dc7dece72853f SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600 WHIRLPOOL 72cb012a4da2be27e0c747ad86cd14ab86998c20357becdf254aa1114f9aca4da135b1ed95ca281aa14f27a2fe2fc1199677fed719a10d342ea0ab9a9fcc8be4
 DIST docker-proxy-0.8.0_p20180709.tar.gz 2718698 SHA256 572ce85f2c51a21c1cd55056cf8cb9ef1d447c2de9c82485233be9f851284299 SHA512 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d WHIRLPOOL 4294149756e8549f7d9785db462fb32aaa5e49ff1d74653bf824726dc744f5582c66531b8052542c28cebf01c5d5280fef6b12d0b2c0b75126ef5595d3c097a7
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
deleted file mode 100644
index 1676a13458..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/docker/libnetwork"
-
-COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.9"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS="~amd64 ~arm64"
-	inherit golang-vcs
-else
-	EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-	inherit golang-vcs-snapshot
-fi
-
-inherit coreos-go
-
-DESCRIPTION="Docker container networking"
-HOMEPAGE="https://github.com/docker/libnetwork"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RDEPEND="!<app-emulation/docker-1.13.0_rc1"
-
-RESTRICT="test" # needs dockerd
-
-src_compile() {
-	go_build "${COREOS_GO_PACKAGE}/cmd/proxy"
-}
-
-src_install() {
-	dodoc ROADMAP.md README.md CHANGELOG.md
-	newbin "${GOBIN}"/proxy docker-proxy
-}
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 4017674058..ce795bcaf4 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_rc5.tar.gz 1185541 SHA256 a7fe83b7711aec0c82554d28ac0dbadfef1cb954ab5c2feccd34a57cfb720037 SHA512 f7d765c6d0a24adf1030cb41d71ce532f2f5b3dd4c05c48aaa6eb37604c3854cc3a463aff19defc7c259564e237ef30f7e39d4787dad0ee42bb534c3d65946c0 WHIRLPOOL 4ef03e74635fe434f65b23efda50aac8c929c9d007804d8477058c0684e2394af5156543af00a860990352d0567f12b37f1e35c1d83085660718ddc4ea92d6c5
 DIST docker-runc-1.0.0_rc5_p19.tar.gz 1185576 SHA256 994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3 WHIRLPOOL 354a12c1758ee499c850e3e4efb3d8eacbbc54649dad11d2d259b28ff8220e47fd97f406dfa15d98f688e5dfe79c78452e451b5d50be745b57fe620acb24f98e
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild
deleted file mode 100644
index 8c9dbaa896..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild
+++ /dev/null
@@ -1,67 +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.9"
-# the commit of runc that docker uses.
-# see https://github.com/docker/docker-ce/blob/v18.03.0-ce/components/engine/hack/dockerfile/install/runc.installer#L4
-COMMIT_ID="4fc53a81fb7c994640722ac585fa9ca548971871"
-
-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/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest
index f36613cb19..583445afd9 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 @@
-DIST docker-18.03.1.tar.gz 12758590 SHA256 b05f3709844c45d49922914cf6eb71d4131d0bd5389361376ff6a86aa186f4a0 SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10 WHIRLPOOL a3bab244645243db9c4072be3f81d22298ddf0b4b2d260bc57a7244981fe67acd4cd308e82a2bc5e2afde7b90351aac41fba4808a5b64d0eec6dc03113aed8f2
 DIST docker-18.06.0.tar.gz 13656557 SHA256 18754ecb38d7c210fb2b96ee618dc2bdf94e66cd501d4eef0c685903a83e8501 SHA512 d5bd6a83126c4dba14c775533b6c9bda35af2cd97db13922b3766494ce10dd9316d0167c87a6683dede28ea063f9435a0a009b96e413dad8abc7884a3468d589 WHIRLPOOL 708a9ce17f440c4d2161a89b92591c82653b8d61eb7e1d72d47b389f674d92c826bf5f86daa3f770450479e8768fc8f451ee6cbc0f5ffd8585be527f8f2a0005
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.03.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.03.1.ebuild
deleted file mode 100644
index a6925f3582..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.03.1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COREOS_GO_PACKAGE="github.com/docker/docker-ce"
-COREOS_GO_VERSION="go1.9"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${COREOS_GO_PACKAGE}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}"
-	inherit git-r3
-	KEYWORDS="~amd64 ~arm64"
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="9ee9f40"
-	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!"
-fi
-inherit bash-completion-r1 coreos-go-depend linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=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 )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# For CoreOS builds coreos-kernel must be installed because this ebuild
-# checks the kernel config. The kernel config is left by the kernel compile
-# or an explicit copy when installing binary packages. See coreos-kernel.eclass
-DEPEND+="sys-kernel/coreos-kernel"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=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.3
-	=app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?]
-	=app-emulation/docker-proxy-0.8.0_p20180411
-	container-init? ( >=sys-process/tini-0.13.1 )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}"
-
-ENGINE_PATCHES=()
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~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
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		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
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_unpack() {
-	if [ -n "$DOCKER_GITCOMMIT" ]; then
-		mkdir -p "${S}"
-		tar --strip-components=1 -C "${S}" -xf "${DISTDIR}/${A}"
-		DOCKER_BUILD_DATE=$(date --reference="${S}/VERSION" +%s)
-	else
-		git-r3_src_unpack
-		DOCKER_GITCOMMIT=$(git -C "${S}" rev-parse HEAD | head -c 7)
-		DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct")
-	fi
-	[ "${#ENGINE_PATCHES[@]}" -gt 0 ] && eapply -d"${S}"/components/engine "${ENGINE_PATCHES[@]}"
-}
-
-src_compile() {
-	local -x DISABLE_WARN_OUTSIDE_CONTAINER=1
-	go_export
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="${CGO_CFLAGS} -I${ROOT}/usr/include"
-	export CGO_LDFLAGS="${CGO_LDFLAGS} -L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp selinux journald; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s#EXTLDFLAGS_STATIC='#&-fno-PIC $LDFLAGS #" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s#LDFLAGS_STATIC_DOCKER='#&-extldflags \"-fno-PIC $LDFLAGS\" #" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	SOURCE_DATE_EPOCH="${DOCKER_BUILD_DATE}" \
-	VERSION="$(<../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# Imitating https://github.com/docker/docker-ce/blob/v18.03.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 \
-		BUILDTIME="${CLI_BUILDTIME}" \
-		LDFLAGS="$(usex hardened "-extldflags \"-fno-PIC $LDFLAGS\"" '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	exeinto /usr/lib/coreos
-	# Create /usr/lib/coreos/dockerd for backwards compatibility
-	doexe "${FILESDIR}/dockerd"
-
-	systemd_dounit "${FILESDIR}/docker.service"
-	systemd_dounit "${FILESDIR}/docker.socket"
-
-	insinto /usr/lib/systemd/network
-	doins "${FILESDIR}"/50-docker.network
-	doins "${FILESDIR}"/90-docker-veth.network
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.03.ebuild
deleted file mode 100644
index 7ee28f9ca8..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.03.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2017-2018 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Packages to be installed in a torcx image for Docker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-# Explicitly list all packages that will be built into the image.
-RDEPEND="
-	=app-emulation/docker-18.03.1
-	=app-emulation/containerd-1.0.3
-	=app-emulation/docker-proxy-0.8.0_p20180411
-	=app-emulation/docker-runc-1.0.0_rc5
-	=dev-libs/libltdl-2.4.6
-	=sys-process/tini-0.13.2
-"
-
-src_install() {
-	insinto /.torcx
-	newins "${FILESDIR}/${P}-manifest.json" manifest.json
-
-	# Enable the Docker socket by default.
-	local unitdir=/usr/lib/systemd/system
-	dosym ../docker.socket "${unitdir}/sockets.target.wants/docker.socket"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.03-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.03-manifest.json
deleted file mode 100644
index 190f9e8538..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-18.03-manifest.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "kind": "image-manifest-v0",
-    "value": {
-        "bin": [
-            "/bin/containerd",
-            "/bin/containerd-shim",
-            "/bin/ctr",
-            "/bin/docker",
-            "/bin/docker-containerd",
-            "/bin/docker-containerd-shim",
-            "/bin/docker-init",
-            "/bin/docker-proxy",
-            "/bin/docker-runc",
-            "/bin/dockerd",
-            "/bin/runc",
-            "/bin/tini"
-        ],
-        "network": [
-            "/lib/systemd/network/50-docker.network",
-            "/lib/systemd/network/90-docker-veth.network"
-        ],
-        "units": [
-            "/lib/systemd/system/containerd.service",
-            "/lib/systemd/system/docker.service",
-            "/lib/systemd/system/docker.socket",
-            "/lib/systemd/system/sockets.target.wants"
-        ]
-    }
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.9
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.8
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.3.9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.2.0-r1
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.2.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-arch/torcx-0.2.0-r1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1
similarity index 70%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1
index 87f44f0f42..adbec87474 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.1.1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) dev-lang/go:1.9= virtual/pkgconfig
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) dev-lang/go:1.10= virtual/pkgconfig
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
-IUSE=+btrfs hardened +go_version_go1_9
+IUSE=+btrfs hardened +go_version_go1_10
 KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
-RDEPEND==app-emulation/docker-runc-1.0.0_rc5 sys-libs/libseccomp
-REQUIRED_USE=go_version_go1_9
+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.0.3.tar.gz -> containerd-1.0.3.tar.gz
+SRC_URI=https://github.com/containerd/containerd/archive/v1.1.1.tar.gz -> containerd-1.1.1.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_=0120bc4010a032f9cb060027cd3b8aaf
+_md5_=61e6af03045ddfe0a2c5a97c318b8a31
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 4c4f38ca8f..eb002a08bc 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
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-vcs/git-1.8.2.1[curl] dev-lang/go:1.9= virtual/pkgconfig
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-vcs/git-1.8.2.1[curl] dev-lang/go:1.10= virtual/pkgconfig
 DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
-IUSE=+btrfs hardened +go_version_go1_9
+IUSE=+btrfs hardened +go_version_go1_10
 LICENSE=Apache-2.0
-RDEPEND==app-emulation/docker-runc-1.0.0_rc5 sys-libs/libseccomp
-REQUIRED_USE=go_version_go1_9
+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	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_=0120bc4010a032f9cb060027cd3b8aaf
+_md5_=61e6af03045ddfe0a2c5a97c318b8a31
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.03.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.03.1
deleted file mode 100644
index 36e0d300ce..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.03.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel dev-lang/go:1.9= virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The core functions you need to create Docker images and run Docker containers
-EAPI=6
-HOMEPAGE=https://dockerproject.org
-IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_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.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180411 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/v18.03.1-ce.tar.gz -> docker-18.03.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_=40e4a0d62f6053fc3f3ec2f45154d4ce
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0
similarity index 76%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0
index e2ec375993..dd84f524cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.05.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-18.06.0
@@ -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 ) >=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.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180411 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.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 )
 REQUIRED_USE=go_version_go1_10
 RESTRICT=installsources strip
 SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz -> docker-18.05.0.tar.gz
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.06.0-ce.tar.gz -> docker-18.06.0.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_=6e931ad5894fb8f31ced80968c315e47
+_md5_=166c2fb16a8b760c38941e430b5a49cf
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 8b5e03eefc..13b87a276a 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 ) >=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.3 =app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180411 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.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 )
 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_=6e931ad5894fb8f31ced80968c315e47
+_md5_=166c2fb16a8b760c38941e430b5a49cf
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180709
similarity index 77%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180709
index 0f6ca3db73..26a2c85a7c 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180709
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.9 dev-lang/go:1.9=
+DEPEND=>=dev-lang/go-1.9 dev-lang/go:1.10=
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
-IUSE=+go_version_go1_9
+IUSE=+go_version_go1_10
 KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
-REQUIRED_USE=go_version_go1_9
+REQUIRED_USE=go_version_go1_10
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/docker/libnetwork/archive/c15b372ef22125880d378167dde44f4b134e1a77.tar.gz -> docker-proxy-0.8.0_p20180411.tar.gz
+SRC_URI=https://github.com/docker/libnetwork/archive/3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b.tar.gz -> docker-proxy-0.8.0_p20180709.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	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a485ee34bd310525095e1892e1c17d2d
+_md5_=fcdbb5e8df0ffe8d91462d7f1dbdbb7f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-9999
index c678bddefc..5e0bf8b154 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-proxy-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.9 dev-lang/go:1.9=
+DEPEND=>=dev-lang/go-1.9 dev-lang/go:1.10=
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
-IUSE=+go_version_go1_9
+IUSE=+go_version_go1_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
-REQUIRED_USE=go_version_go1_9
+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	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a485ee34bd310525095e1892e1c17d2d
+_md5_=fcdbb5e8df0ffe8d91462d7f1dbdbb7f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19
similarity index 81%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19
index 1981f261aa..944d8f4c8e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc5_p19
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-lang/go:1.9=
+DEPEND=dev-lang/go:1.10=
 DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
-IUSE=ambient apparmor hardened +seccomp selinux +go_version_go1_9
+IUSE=ambient apparmor hardened +seccomp selinux +go_version_go1_10
 KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/runc
-REQUIRED_USE=go_version_go1_9
+REQUIRED_USE=go_version_go1_10
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/4fc53a81fb7c994640722ac585fa9ca548971871.tar.gz -> docker-runc-1.0.0_rc5.tar.gz
+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_=67ca481c56cab39fae5b5ea750e7bc12
+_md5_=a97f141e08b4570478f7d958fcfea65d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.03 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.03
deleted file mode 100644
index ec09620091..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.03
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Packages to be installed in a torcx image for Docker
-EAPI=2
-KEYWORDS=amd64 arm64
-LICENSE=GPL-2
-RDEPEND==app-emulation/docker-18.03.1 =app-emulation/containerd-1.0.3 =app-emulation/docker-proxy-0.8.0_p20180411 =app-emulation/docker-runc-1.0.0_rc5 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
-SLOT=0
-_md5_=09098c5c4469474a07d3980a61f2e226
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05
deleted file mode 100644
index 44a2c06d6b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.05
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Packages to be installed in a torcx image for Docker
-EAPI=2
-KEYWORDS=amd64 arm64
-LICENSE=GPL-2
-RDEPEND==app-emulation/docker-18.05.0-r1 =app-emulation/containerd-1.0.3 =app-emulation/docker-proxy-0.8.0_p20180411 =app-emulation/docker-runc-1.0.0_rc5 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
-SLOT=0
-_md5_=3ddd50856558e0818c885cc7f1f3eb1c
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
new file mode 100644
index 0000000000..273f845cb0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-torcx/docker-18.06
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+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
+SLOT=0
+_md5_=b82819fcd6778a78688910c2b5debee2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.8 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.9
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.8
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.9
index 1d3b0d2255..306971c7c4 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.8
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-3.3.9
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 REQUIRED_USE=go_version_go1_10
 SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.3.8.tar.gz -> etcdctl-3.3.8.tar.gz
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.9.tar.gz -> etcdctl-3.3.9.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	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be6ff2d151f20fd19a21c28e51a00646
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.57 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.58
similarity index 83%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.57
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.58
index e708469e60..fe1759a5e8 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.57
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.58
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.14.57 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.57
+DEPEND==sys-kernel/coreos-modules-4.14.58 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.58
 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.57
+RDEPEND==sys-kernel/coreos-modules-4.14.58
 RESTRICT=binchecks strip
-SLOT=0/4.14.57
+SLOT=0/4.14.58
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=b06e416b987a33bf039f3788ebb4a943
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.10
new file mode 100644
index 0000000000..04a06c97de
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND==sys-kernel/coreos-modules-4.17.10 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.17.10
+DESCRIPTION=CoreOS Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+KEYWORDS=amd64 arm64
+LICENSE=GPL-2 freedist
+RDEPEND==sys-kernel/coreos-modules-4.17.10
+RESTRICT=binchecks strip
+SLOT=0/4.17.10
+_eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b06e416b987a33bf039f3788ebb4a943
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.9
deleted file mode 100644
index 9fc38563ec..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.17.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.17.9 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.17.9
-DESCRIPTION=CoreOS Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-KEYWORDS=amd64 arm64
-LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.17.9
-RESTRICT=binchecks strip
-SLOT=0/4.17.9
-_eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b06e416b987a33bf039f3788ebb4a943
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.58
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.9
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.58
index 6e9e997412..c9896723bd 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.9
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.58
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.17.9
+DEPEND==sys-kernel/coreos-sources-4.14.58
 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-kernel/coreos-kernel-4.6.3-r1
 RESTRICT=binchecks strip
-SLOT=0/4.17.9
+SLOT=0/4.14.58
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a88b250c5a7da995b47b632b9f99b8dd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.57 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.10
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.57
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.10
index 3f0512e3d2..03e8cb6402 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.57
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.17.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.14.57
+DEPEND==sys-kernel/coreos-sources-4.17.10
 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-kernel/coreos-kernel-4.6.3-r1
 RESTRICT=binchecks strip
-SLOT=0/4.14.57
+SLOT=0/4.17.10
 _eclasses_=coreos-kernel	e8feb48b1a123c62c678f86fd8ac3067	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	aedb720bff5a5dec9b87edd351382bfc	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=a88b250c5a7da995b47b632b9f99b8dd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.57 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.58
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.57
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.58
index 904195e656..d0a68c4006 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.57
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.14.58
@@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.14.57
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.57.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.58
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.58.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	kernel-2	9c959482618084f1edf862d4783a73b4	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=854d8911063dad798e6a5dc591a9a14e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.10
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.9
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.10
index bb4f59d903..8ab2d44c2d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.9
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.17.10
@@ -8,7 +8,7 @@ KEYWORDS=amd64 arm64
 LICENSE=GPL-2 linux-firmware
 RDEPEND=sys-devel/bison sys-devel/flex !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.17.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
+SLOT=4.17.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz
 _eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	kernel-2	9c959482618084f1edf862d4783a73b4	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	ffa9c3284c6b07b8c9f7933911f63812	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=93ddfff50fe890bb525bc9750f7114c1