Merge pull request #3143 from dm0-/docker

Bump Docker 18.02 to 18.03

sdk_container/src/third_party/coreos-overlay/app-arch/torcx/files/docker-1.12-no.json

@@ -4,7 +4,7 @@
         "images": [
             {
                 "name": "docker",
-                "reference": "18.02"
+                "reference": "18.03"
             }
         ]
     }

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

@@ -1,3 +1,4 @@
 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.1.tar.gz 3766659 SHA256 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160 WHIRLPOOL 29823ab7fed5ec3832644faa77256c5dfdb0ce61496f20848bb4aca1d25f25b318df5539dbad2794497fa27c9100cd85f088419674f2a8a28f937efc4cdab6ef
+DIST containerd-1.0.2.tar.gz 3772144 SHA256 a31a12846a7a2f697f8fdd82cedd1626fc5f6345e59ae880664196c73e4c2226 SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a WHIRLPOOL ef2b648409f48ae72f9cc0dab3f8e1b5fdc31432fa0acc8e0b691adcc6ee9cfda520c6dc142e8d23efeb1989afd3be13ac9ec012788db3320bcf717d3527a902

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

@@ -1 +0,0 @@
-containerd-9999.ebuild

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

@@ -0,0 +1,63 @@
+# 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="9b55aab90508bd389d7654c4baf173a981477d55"
+	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_rc4_p205
+	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/containerd/containerd-1.0.2.ebuild

@@ -0,0 +1 @@
+containerd-9999.ebuild

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="9b55aab90508bd389d7654c4baf173a981477d55"
+	CONTAINERD_COMMIT="cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot
@@ -29,7 +29,7 @@ SLOT="0"
 IUSE="+btrfs hardened"
 
 DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="=app-emulation/docker-runc-1.0.0_rc4_p205
+RDEPEND="=app-emulation/docker-runc-1.0.0_rc5
 	sys-libs/libseccomp"
 
 S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}

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

@@ -1,3 +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_p20180112.tar.gz 2679651 SHA256 25dd368af845c5d4773a0445d9401d11e1b4042ec285a06aa28976de7264e318 SHA512 43d7a8259b5ee2f605ae07dfe64e25b90445b9d38b279a19366df64093dc7d16f3820e3cd67c8569292efc548334a278f1fcbcfb13aed3a73ba980309f8115c9 WHIRLPOOL a346d7440367d8d6a21d8b40bdab9ed58ebbee810221eb2ec6f864fb44ba5e0e0cf69447d526a9b231e635c9c49e3f7b6f791ee9b105288015fbc14c04bc3d14
+DIST docker-proxy-0.8.0_p20180314.tar.gz 2692292 SHA256 f01d6c11eccf63294c97bb7da0c98326ea7f1335ad115a45cfb6cafbe9e26011 SHA512 c33005f0281260a3dcc9dd567680068afbdb9ea6036b2847c9cd3d77e72d32e6b7d359178acbd4a2db7cc15cc53d99079a1b544bc32912dbf19f2babc670a2bd WHIRLPOOL bce3f399b1f6b2e65969b48e39a888dc7338a38fa434f812a0d8eb6465e5b3b9dc582ba0ac7d0f60dcb193f9f530bad39d6070fb3d0ec3268bc803166be24345

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

@@ -5,13 +5,13 @@ EAPI=6
 EGO_PN="github.com/docker/libnetwork"
 
 COREOS_GO_PACKAGE="${EGO_PN}"
-COREOS_GO_VERSION="go1.8"
+COREOS_GO_VERSION="go1.9"
 
 if [[ ${PV} == *9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 	inherit golang-vcs
 else
-	EGIT_COMMIT="fcf1c3b5e57833aaaa756ae3c4140ea54da00319"
+	EGIT_COMMIT="1b91bc94094ecfdae41daa465cc0c8df37dfb3dd"
 	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-runc/Manifest

@@ -1,2 +1,3 @@
 DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 SHA256 2954cb6b468b3806a08c45656acc2019035bc9994c2a9b4249cfde4d9b3a7c93 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 WHIRLPOOL ede821987006a54e7a87f88d9a5104d4a4ecc05a614e111fefa669f5ae436c11004debfe919bec0808194f2d96442775718a0208a1a374a9dd56a896f7dd8640
 DIST docker-runc-1.0.0_rc4_p205.tar.gz 1184954 SHA256 fa9854008f64f71b798ca63aed5be774aa432888bfda0d3ec60f2571647af156 SHA512 c7b24ca6212ce500d1d4c3a1776be5ca116d4f005d71e5fe8f2228c26f039058f3dd1071e9e39aa9c93272a49f7ff2ac86e2fbbcf6115cc3de65a370127d8ea5 WHIRLPOOL c9396ddd948672d59287eb4e07053a1af7e74fa82c1b687e489850ab3dce91ebed8bc0af16b25ddbe8452adeb8ccf46fbc941f368cdc7a889662becfcbd7928a
+DIST docker-runc-1.0.0_rc5.tar.gz 1185541 SHA256 a7fe83b7711aec0c82554d28ac0dbadfef1cb954ab5c2feccd34a57cfb720037 SHA512 f7d765c6d0a24adf1030cb41d71ce532f2f5b3dd4c05c48aaa6eb37604c3854cc3a463aff19defc7c259564e237ef30f7e39d4787dad0ee42bb534c3d65946c0 WHIRLPOOL 4ef03e74635fe434f65b23efda50aac8c929c9d007804d8477058c0684e2394af5156543af00a860990352d0567f12b37f1e35c1d83085660718ddc4ea92d6c5

sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5.ebuild

@@ -0,0 +1,67 @@
+# 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
+}

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

@@ -1,2 +1,2 @@
 DIST docker-17.12.1.tar.gz 11046888 SHA256 e4b58c26c05a800d96d3e5d76375654751d4d1367b5727c798369cf3c78a590e SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7 WHIRLPOOL 218d61a35648b1b58ec0c4f63bbb06695b4739469bcfdf84745886085f1eca5472b59da35514d35f4835bec388b79109dd3c8bd449e86a3dffabb6c9e865d623
-DIST docker-18.02.0.tar.gz 12659242 SHA256 fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 SHA512 4d1bd0ffc893e70fc524f46cacdc4ab035d8b7e0fd7e8de9faf6d9c30b9920b68a99764101e47a8375425b774fe93c317213509b2d1ace87c7598b2b939b849b WHIRLPOOL 6e09cb54bde84c9d901b63c36c1a130badb8d23cd28930b636e7321302bf2e9765763c7f2e76faad5fc170f6ea6210de47c5c70d01e5cd224d4978cfe55cbee9
+DIST docker-18.03.0.tar.gz 12751925 SHA256 07651973b4a4adac86599b5c1abc9b1c82aa143ac18205ff399afa814d403280 SHA512 6385d720a58275d3e415c89f6953b64fdf96c2297ea7a86baf8f044530bb55fef40479e8a018055b85fce73f30dfb36a9904ff13bc12acc6ec4b565431145dbe WHIRLPOOL 321d8f0563e5f269149c59a47c99e79d49f6fc12707b39056c42d9f7e1a7d0b361e1f7881da42c00a17cba512e5d8c75bdf2d97e2a62a8885dad2658e7a09602

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="fc4de44"
+	DOCKER_GITCOMMIT="0520e24"
 	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.1
+	=app-emulation/containerd-1.0.2
-	=app-emulation/docker-runc-1.0.0_rc4_p205[apparmor?,seccomp?]
+	=app-emulation/docker-runc-1.0.0_rc5[apparmor?,seccomp?]
-	=app-emulation/docker-proxy-0.8.0_p20180112
+	=app-emulation/docker-proxy-0.8.0_p20180314
 	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.02.0-ce/components/cli/scripts/build/.variables#L7
+	# Imitating https://github.com/docker/docker-ce/blob/v18.03.0-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,10 +11,10 @@ KEYWORDS="amd64 arm64"
 
 # Explicitly list all packages that will be built into the image.
 RDEPEND="
-	=app-emulation/docker-18.02.0
+	=app-emulation/docker-18.03.0
-	=app-emulation/containerd-1.0.1
+	=app-emulation/containerd-1.0.2
-	=app-emulation/docker-proxy-0.8.0_p20180112
+	=app-emulation/docker-proxy-0.8.0_p20180314
-	=app-emulation/docker-runc-1.0.0_rc4_p205
+	=app-emulation/docker-runc-1.0.0_rc5
 	=dev-libs/libltdl-2.4.6
 	=sys-process/tini-0.13.2
 "