Merge pull request #3198 from dm0-/docker

Bump Docker's LTS image to 18.03.1

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.2.tar.gz 3772144 SHA256 a31a12846a7a2f697f8fdd82cedd1626fc5f6345e59ae880664196c73e4c2226 SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a WHIRLPOOL ef2b648409f48ae72f9cc0dab3f8e1b5fdc31432fa0acc8e0b691adcc6ee9cfda520c6dc142e8d23efeb1989afd3be13ac9ec012788db3320bcf717d3527a902
 DIST containerd-1.0.3.tar.gz 3776722 SHA256 299e3a93eac232c1259fe058e724bfc274741b13b9de96116d1f61619bb2789e SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c WHIRLPOOL 72c6d43a9377e6c88b04b35913496197a711843962801870c53a43d55c71968ff618307827c2ddbcff12474fb9a84ae8ec61256e2f384c4c37d8c9384234c679

sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.2.ebuild

@@ -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="cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"
-	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"
-}

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest

@@ -1,3 +1,4 @@
 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_p20180314.tar.gz 2692292 SHA256 f01d6c11eccf63294c97bb7da0c98326ea7f1335ad115a45cfb6cafbe9e26011 SHA512 c33005f0281260a3dcc9dd567680068afbdb9ea6036b2847c9cd3d77e72d32e6b7d359178acbd4a2db7cc15cc53d99079a1b544bc32912dbf19f2babc670a2bd WHIRLPOOL bce3f399b1f6b2e65969b48e39a888dc7338a38fa434f812a0d8eb6465e5b3b9dc582ba0ac7d0f60dcb193f9f530bad39d6070fb3d0ec3268bc803166be24345
+DIST docker-proxy-0.8.0_p20180411.tar.gz 2692292 SHA256 f01d6c11eccf63294c97bb7da0c98326ea7f1335ad115a45cfb6cafbe9e26011 SHA512 c33005f0281260a3dcc9dd567680068afbdb9ea6036b2847c9cd3d77e72d32e6b7d359178acbd4a2db7cc15cc53d99079a1b544bc32912dbf19f2babc670a2bd WHIRLPOOL bce3f399b1f6b2e65969b48e39a888dc7338a38fa434f812a0d8eb6465e5b3b9dc582ba0ac7d0f60dcb193f9f530bad39d6070fb3d0ec3268bc803166be24345

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180314.ebuild

@@ -1 +0,0 @@
-docker-proxy-9999.ebuild

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180314.ebuild

@@ -0,0 +1,42 @@
+# 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="1b91bc94094ecfdae41daa465cc0c8df37dfb3dd"
+	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
+}

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild

@@ -0,0 +1 @@
+docker-proxy-9999.ebuild

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 	inherit golang-vcs
 else
-	EGIT_COMMIT="1b91bc94094ecfdae41daa465cc0c8df37dfb3dd"
+	EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit golang-vcs-snapshot

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest

@@ -1,2 +1,2 @@
-DIST docker-18.03.0.tar.gz 12751925 SHA256 07651973b4a4adac86599b5c1abc9b1c82aa143ac18205ff399afa814d403280 SHA512 6385d720a58275d3e415c89f6953b64fdf96c2297ea7a86baf8f044530bb55fef40479e8a018055b85fce73f30dfb36a9904ff13bc12acc6ec4b565431145dbe WHIRLPOOL 321d8f0563e5f269149c59a47c99e79d49f6fc12707b39056c42d9f7e1a7d0b361e1f7881da42c00a17cba512e5d8c75bdf2d97e2a62a8885dad2658e7a09602
+DIST docker-18.03.1.tar.gz 12758590 SHA256 b05f3709844c45d49922914cf6eb71d4131d0bd5389361376ff6a86aa186f4a0 SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10 WHIRLPOOL a3bab244645243db9c4072be3f81d22298ddf0b4b2d260bc57a7244981fe67acd4cd308e82a2bc5e2afde7b90351aac41fba4808a5b64d0eec6dc03113aed8f2
 DIST docker-18.04.0.tar.gz 12797074 SHA256 7bd16f2a97dcfaa450e42d5f5d838e490feb1db3933fa187859b487c45fee253 SHA512 83a8327c714296b769ef258c291d239195459b833c5be635ee29ecbe53597d74f064d398e4b66870e2e30be17c91ea34820fd563b0d089e862b43a4cada4963a WHIRLPOOL b73a1eef90004160cac091f55a128d07c4bce184d7917562a85aac9ffe586e8c721b6cfa13c19d1049880a6916ba01820ec381d340469a417da4d56849f582dd

sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.03.1.ebuild

@@ -19,7 +19,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="0520e24"
+	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!"
@@ -64,9 +64,9 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	dev-libs/libltdl
-	=app-emulation/containerd-1.0.2
+	=app-emulation/containerd-1.0.3
 	=app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?]
-	=app-emulation/docker-proxy-0.8.0_p20180314
+	=app-emulation/docker-proxy-0.8.0_p20180411
 	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/v18.03.0-ce/components/cli/scripts/build/.variables#L7
+	# 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 \

sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.03.ebuild

@@ -11,9 +11,9 @@ KEYWORDS="amd64 arm64"
 
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
-	=app-emulation/docker-18.03.0
+	=app-emulation/docker-18.03.1
-	=app-emulation/containerd-1.0.2
+	=app-emulation/containerd-1.0.3
-	=app-emulation/docker-proxy-0.8.0_p20180314
+	=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

sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-1.0.2

@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) dev-lang/go:1.9= virtual/pkgconfig
-DESCRIPTION=A daemon to control runC
-EAPI=6
-HOMEPAGE=https://containerd.tools
-IUSE=+btrfs hardened +go_version_go1_9
-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
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/v1.0.2.tar.gz -> containerd-1.0.2.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_=0f20703ab505acfad0e57f26dcf41dea