* [gentoo-commits] gentoo-x86 commit in app-emulation/docker: metadata.xml docker-0.8.0.ebuild ChangeLog
@ 2014-02-05 22:27 Greg Kroah-Hartman (gregkh)
0 siblings, 0 replies; only message in thread
From: Greg Kroah-Hartman (gregkh) @ 2014-02-05 22:27 UTC (permalink / raw
To: gentoo-commits
gregkh 14/02/05 22:27:43
Modified: metadata.xml ChangeLog
Added: docker-0.8.0.ebuild
Log:
0.8.0 bump
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.4 app-emulation/docker/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 31 Dec 2013 16:46:51 -0000 1.3
+++ metadata.xml 5 Feb 2014 22:27:43 -0000 1.4
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer status="active">
- <email>admwiggin@gmail.com</email>
- <name>Tianon</name>
- </maintainer>
<longdescription>
Docker is an open-source project to easily create lightweight,
portable, self-sufficient containers from any application. The same
@@ -13,11 +8,19 @@
scale, in production, on VMs, bare metal, OpenStack clusters, public
clouds and more.
</longdescription>
+ <maintainer status="active">
+ <email>admwiggin@gmail.com</email>
+ <name>Tianon</name>
+ </maintainer>
<use>
<flag name="aufs">
Enables dependencies for the "aufs" driver, including necessary
kernel flags.
</flag>
+ <flag name="btrfs">
+ Enables dependencies for the experimental "btrfs" driver,
+ including necessary kernel flags.
+ </flag>
<flag name="device-mapper">
Enables dependencies for the "device-mapper" driver, including
necessary kernel flags.
1.15 app-emulation/docker/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 16 Jan 2014 21:35:21 -0000 1.14
+++ ChangeLog 5 Feb 2014 22:27:43 -0000 1.15
@@ -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.14 2014/01/16 21:35:21 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.15 2014/02/05 22:27:43 gregkh Exp $
+
+*docker-0.8.0 (05 Feb 2014)
+
+ 05 Feb 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.8.0.ebuild,
+ metadata.xml:
+ 0.8.0 bump
*docker-0.7.6 (16 Jan 2014)
1.1 app-emulation/docker/docker-0.8.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.8.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-0.8.0.ebuild?rev=1.1&content-type=text/plain
Index: docker-0.8.0.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.8.0.ebuild,v 1.1 2014/02/05 22:27:43 gregkh Exp $
EAPI=5
DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
HOMEPAGE="http://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="cc3a8c8"
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 +device-mapper doc 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
sys-fs/lvm2[thin]
"
DEPEND="
${CDEPEND}
>=dev-lang/go-1.2
>=sys-fs/btrfs-progs-0.20
dev-vcs/git
dev-vcs/mercurial
doc? (
dev-python/sphinx
dev-python/sphinxcontrib-httpdomain
)
"
RDEPEND="
${CDEPEND}
!app-emulation/docker-bin
>=sys-apps/iproute2-3.5
>=net-firewall/iptables-1.4
>=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() {
CONFIG_CHECK+="
~BRIDGE
~IP_NF_TARGET_MASQUERADE
~MEMCG_SWAP
~NETFILTER_XT_MATCH_ADDRTYPE
~NETFILTER_XT_MATCH_CONNTRACK
~NF_NAT
~NF_NAT_NEEDED
"
ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS
"
ERROR_AUFS_FS="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() {
# eventually, perhaps Gentoo will include a "go" eclass to do some of this
export GOPATH="${WORKDIR}/gopath"
mkdir -p "$GOPATH" || die
# make sure docker itself is in our shiny new GOPATH
mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die
ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die
# we need our vendored deps, too
export GOPATH="$GOPATH:$(pwd -P)/vendor"
# 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/export LDFLAGS_STATIC="/export LDFLAGS_STATIC="-extldflags=-fno-PIC /' hack/make/dynbinary || die
grep -q '-extldflags=-fno-PIC' hack/make/dynbinary || die 'sed failed'
fi
# time to build!
./hack/make.sh dynbinary || die
if use doc; then
emake -C docs docs man || die
fi
}
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
dohtml -r docs/_build/html/*
doman docs/_build/man/*
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
insinto /usr/share/${P}/contrib
doins contrib/README
cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
}
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 ""
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-05 22:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-05 22:27 [gentoo-commits] gentoo-x86 commit in app-emulation/docker: metadata.xml docker-0.8.0.ebuild ChangeLog Greg Kroah-Hartman (gregkh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox