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 b4400ace24..4017674058 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,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_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 index ce9be2da03..8c9dbaa896 100644 --- 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 @@ -7,7 +7,7 @@ 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.05.0-ce/components/engine/hack/dockerfile/install/runc.installer#L4 +# 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 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 new file mode 100644 index 0000000000..34ed8af031 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc5_p19.ebuild @@ -0,0 +1,68 @@ +# 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.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 +# 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: +# $ git log --oneline v1.0.0-rc5..${COMMIT_ID} | wc -l +COMMIT_ID="69663f0bd4b60df09991c08812a60108003fa340" + +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' '') + ) + + GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ + COMMIT="${COMMIT_ID}" +} + +src_install() { + dobin runc +}