diff options
| -rw-r--r-- | app-emulation/docker/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/docker/docker-9999.ebuild | 36 |
2 files changed, 17 insertions, 21 deletions
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index d62502bb..9f953551 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -15,4 +15,4 @@ EBUILD docker-1.0.0.ebuild 5622 SHA256 a75ff4862df2bb08b364220264918404cb6b93504 EBUILD docker-1.10.3.ebuild 8251 SHA256 2b1aa8b750675e742e03e9542f48a746f750346ce47d10a03af2270b32b8b073 SHA512 ace7c30ddbae4c83a5411e648cd0008edc7431e6d45b5f8dee8916cd38a0b013ccf427c1e7ec308984f368508505032082d0b6b205f04cfaee7412463cc7641a WHIRLPOOL 21e7041aaf35c9bd0316abafe00c52e8d35065259839dfd2fcbd8213a69f94c8ac2f81d756bbe39fbb5a91f2b2b8525b707333a96a9c8f5d8080a7ef86d196d3 EBUILD docker-1.11.0.ebuild 8387 SHA256 3141d719394b5a1dc634b7a5983b2c86d6ebac9cbe548a00156b16aa398039b8 SHA512 42efb087a2483279173aaed732592aae8cce3c9b51b5cb7c48ee7425a00d167dddf2abcdc1a85b34839abdf54d2868d201a4f6c2b3fa7151003977db051972da WHIRLPOOL 6c0143b7df84b581fc735c71ac19fdf6d86e83f01e413c9fbe21660d9c691b1cfba122535ce0bda602e60ce29e51cba6f4a8645fcbf9c0730fa0f9f819df7e3a EBUILD docker-1.7.1.ebuild 7527 SHA256 9653e8bc1f6a3829910ea200d3245c41c5f1a2e98403401d2666c8c61abf7371 SHA512 110af8901e95f74fa711d7672c5d7948c754ba588594b330eb0de29685d338b3ef9b442ceb0a64cdbeb47c137b34fa5c7feb1e64fa0ab9397966d0cb9b8faf06 WHIRLPOOL 9b0ec6ef70d32665de9773e216b390639c453955e69d502dbf090c7ccb908e532c2c04aab51280e3ea2a5a54802cc32b97f0ce44f72ae84f903e11f67832d6fe -EBUILD docker-9999.ebuild 7817 SHA256 713aac8a961b783bbcd3f238fd1d3cec816b439ff884094bc3dd2e2b5d408c8b SHA512 7bc7ab24c808d0033ae529f371177424bef4a38fdff1b45293471e8ccee088f9ab84f84e37ae015bc1ac47ffc5b7bb2dacad616cbad7588e831bba412e74805f WHIRLPOOL b412b55085a93169eeda39253638213f0f9dce66574e6b7451638f74d4675ff7a093ebaa200270de701321f626c0c2e01eb1102d7c7d959e07acaa20b15bf0c7 +EBUILD docker-9999.ebuild 7863 SHA256 44c8bcb7b28db069a7561b7bfc554f107a434b8e0cbfb45502e56416e093003f SHA512 afccf8f17a20ba83f07e804af1a0400cfc8b0654be786fb4698b8698712ee2fb4e13460ec745af3b3e88b28da9535898bfe93023bd7073b5749b2fbefba0a5ed WHIRLPOOL 5cffcc88ffd36fd6d9fad16658f83bd1096e5d3438081711a94662f243964e46b2f1891087b3e53414d73b306e80435862c9d4e133a723cbd736a5f25eea658d diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index 5a7700f5..a34c5121 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: 4b3fc942264da8dfff56a2dc8fbff32f9a6da7bc $ +# $Id: 0667345ad26a10e77d662057bd9a29f8b9270ecb $ -EAPI=5 +EAPI=6 EGO_PN="github.com/docker/docker" @@ -10,17 +10,17 @@ if [[ ${PV} = *9999* ]]; then # Docker cannot be fetched via "go get", thanks to autogenerated code EGIT_REPO_URI="https://${EGO_PN}.git" EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" - inherit golang-base git-r3 + inherit git-r3 else MY_PV="${PV/_/-}" - DOCKER_GITCOMMIT="4dc5990" + DOCKER_GITCOMMIT="906eacd" EGIT_COMMIT="v${MY_PV}" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" inherit golang-vcs-snapshot fi -inherit bash-completion-r1 linux-info multilib systemd udev user +inherit bash-completion-r1 golang-base linux-info systemd udev user DESCRIPTION="The core functions you need to create Docker images and run Docker containers" HOMEPAGE="https://dockerproject.org" @@ -34,9 +34,8 @@ CDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) - seccomp? ( - >=sys-libs/libseccomp-2.2.1[static-libs] - ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) " DEPEND=" @@ -63,12 +62,8 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 - >=app-emulation/containerd-0.2.0 - >=app-emulation/runc-0.1.0 - - apparmor? ( - sys-libs/libapparmor[static-libs] - ) + >app-emulation/containerd-0.2.2 + app-emulation/runc[apparmor?,seccomp?] " RESTRICT="installsources strip" @@ -78,7 +73,7 @@ CONFIG_CHECK=" ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS ~DEVPTS_MULTIPLE_INSTANCES ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~KEYS ~MACVLAN ~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 @@ -94,6 +89,7 @@ CONFIG_CHECK=" ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED " +ERROR_KEYS="CONFIG_KEYS: is mandatory" ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" 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" @@ -175,9 +171,10 @@ pkg_setup() { src_prepare() { cd "src/${EGO_PN}" || die - epatch "${FILESDIR}/docker-containerd.patch" + sed -i 's/docker-containerd/containerd/g; s/docker-runc/runc/g' libcontainerd/remote_linux.go # allow user patches (use sparingly - upstream won't support them) - epatch_user + cd - + eapply_user } src_compile() { @@ -232,9 +229,8 @@ src_compile() { src_install() { cd "src/${EGO_PN}" || die VERSION="$(cat VERSION)" - newbin "bundles/$VERSION/dynbinary/docker-$VERSION" docker - #exeinto /usr/libexec/docker - #newexe "bundles/$VERSION/dynbinary/dockerinit-$VERSION" dockerinit + newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker + newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker |