gregkh 14/05/09 02:39:45 Modified: metadata.xml ChangeLog Added: docker-0.11.1.ebuild Log: 0.11.1 version bump (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.6 app-emulation/docker/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?r1=1.5&r2=1.6 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/metadata.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- metadata.xml 11 Mar 2014 17:57:50 -0000 1.5 +++ metadata.xml 9 May 2014 02:39:45 -0000 1.6 @@ -21,6 +21,9 @@ Enables dependencies for the "btrfs" graph driver, including necessary kernel flags. </flag> + <flag name="contrib"> + Install additional contrib scripts and components. + </flag> <flag name="device-mapper"> Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags. 1.20 app-emulation/docker/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.19&r2=1.20 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ChangeLog 9 Apr 2014 05:55:23 -0000 1.19 +++ ChangeLog 9 May 2014 02:39:45 -0000 1.20 @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.19 2014/04/09 05:55:23 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.20 2014/05/09 02:39:45 gregkh Exp $ + +*docker-0.11.1 (09 May 2014) + + 09 May 2014; Greg Kroah-Hartman <gre...@gentoo.org> +docker-0.11.1.ebuild, + metadata.xml: + 0.11.1 version bump *docker-0.10.0 (09 Apr 2014) 1.1 app-emulation/docker/docker-0.11.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.11.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.11.1.ebuild?rev=1.1&content-type=text/plain Index: docker-0.11.1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.11.1.ebuild,v 1.1 2014/05/09 02:39:45 gregkh Exp $ EAPI=5 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level." HOMEPAGE="https://www.docker.io/"; GITHUB_URI="github.com/dotcloud/docker" if [[ ${PV} == *9999 ]]; then SRC_URI="" EGIT_REPO_URI="git://${GITHUB_URI}.git" inherit git-2 KEYWORDS="" else SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip" DOCKER_GITCOMMIT="fb99f99" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi inherit bash-completion-r1 linux-info systemd udev user LICENSE="Apache-2.0" SLOT="0" IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion" # TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper CDEPEND=" >=dev-db/sqlite-3.7.9:3 device-mapper? ( sys-fs/lvm2[thin] ) " DEPEND=" ${CDEPEND} >=dev-lang/go-1.2 btrfs? ( >=sys-fs/btrfs-progs-0.20 ) dev-vcs/git dev-vcs/mercurial " RDEPEND=" ${CDEPEND} !app-emulation/docker-bin >=net-firewall/iptables-1.4 lxc? ( >=app-emulation/lxc-0.8 ) >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) ) " RESTRICT="strip" pkg_setup() { if kernel_is lt 3 8; then ewarn "" ewarn "Using Docker with kernels older than 3.8 is unstable and unsupported." ewarn "" fi # many of these were borrowed from the app-emulation/lxc ebuild CONFIG_CHECK+=" ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_SCHED ~CPUSETS ~MEMCG_SWAP ~RESOURCE_COUNTERS ~IPC_NS ~NAMESPACES ~PID_NS ~DEVPTS_MULTIPLE_INSTANCES ~MACVLAN ~NET_NS ~UTS_NS ~VETH ~!NETPRIO_CGROUP ~POSIX_MQUEUE ~BRIDGE ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NF_NAT ~NF_NAT_NEEDED ~!GRKERNSEC_CHROOT_CAPS ~!GRKERNSEC_CHROOT_CHMOD ~!GRKERNSEC_CHROOT_DOUBLE ~!GRKERNSEC_CHROOT_MOUNT ~!GRKERNSEC_CHROOT_PIVOT " ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable" done if use aufs; then CONFIG_CHECK+=" ~AUFS_FS " ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used" fi if use btrfs; then CONFIG_CHECK+=" ~BTRFS_FS " fi if use device-mapper; then CONFIG_CHECK+=" ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS " fi check_extra_config } src_compile() { # if we treat them right, Docker's build scripts will set up a # reasonable GOPATH for us export AUTO_GOPATH=1 # setup CFLAGS and LDFLAGS for separate build target # see https://github.com/tianon/docker-overlay/pull/10 export CGO_CFLAGS="-I${ROOT}/usr/include" export CGO_LDFLAGS="-L${ROOT}/usr/lib" # if we're building from a zip, we need the GITCOMMIT value [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT if gcc-specs-pie; then sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' fi # let's set up some optional features :) export DOCKER_BUILDTAGS='' for gd in aufs btrfs device-mapper; do if ! use $gd; then DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" fi done # time to build! ./hack/make.sh dynbinary || die # TODO pandoc the man pages using contrib/man/md/md2man-all.sh } src_install() { VERSION=$(cat VERSION) newbin bundles/$VERSION/dynbinary/docker-$VERSION docker exeinto /usr/libexec/docker newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit newinitd contrib/init/openrc/docker.initd docker newconfd contrib/init/openrc/docker.confd docker systemd_dounit contrib/init/systemd/docker.service udev_dorules contrib/udev/*.rules dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md if use doc; then # TODO doman contrib/man/man*/* docompress -x /usr/share/doc/${PF}/md docinto md dodoc -r docs/sources/* fi dobashcomp contrib/completion/bash/* if use zsh-completion; then insinto /usr/share/zsh/site-functions doins contrib/completion/zsh/* fi if use vim-syntax; then insinto /usr/share/vim/vimfiles doins -r contrib/syntax/vim/ftdetect doins -r contrib/syntax/vim/syntax fi if use contrib; then insinto /usr/share/${PN}/contrib doins -r contrib/* fi } 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 "" # create docker group if the code checking for it in /etc/group exists enewgroup docker elog "To use docker as a non-root user, add yourself to the docker group." elog "" }
