xarthisius 15/05/08 17:26:21 Modified: ChangeLog Added: docker-1.6.1.ebuild Removed: docker-1.6.0.ebuild Log: Version bump, drop old wrt #548884 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
Revision Changes Path 1.45 app-emulation/docker/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.45&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?rev=1.45&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/ChangeLog?r1=1.44&r2=1.45 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 4 May 2015 12:05:27 -0000 1.44 +++ ChangeLog 8 May 2015 17:26:21 -0000 1.45 @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.44 2015/05/04 12:05:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.45 2015/05/08 17:26:21 xarthisius Exp $ + +*docker-1.6.1 (08 May 2015) + + 08 May 2015; Kacper Kowalik <xarthis...@gentoo.org> +docker-1.6.1.ebuild, + -docker-1.6.0.ebuild: + Version bump, drop old wrt #548884 04 May 2015; Justin Lecher <j...@gentoo.org> docker-1.6.0.ebuild: Add missing dependency on aufs4, thanks jbergstroem for the report 1.1 app-emulation/docker/docker-1.6.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.6.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/docker-1.6.1.ebuild?rev=1.1&content-type=text/plain Index: docker-1.6.1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.6.1.ebuild,v 1.1 2015/05/08 17:26:21 xarthisius Exp $ EAPI=5 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level" HOMEPAGE="https://www.docker.com"; GITHUB_URI="github.com/docker/docker" if [[ ${PV} == *9999 ]]; then SRC_URI="" EGIT_REPO_URI="git://${GITHUB_URI}.git" inherit git-2 else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" DOCKER_GITCOMMIT="97cd073" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi inherit bash-completion-r1 linux-info multilib systemd udev user LICENSE="Apache-2.0" SLOT="0" IUSE="aufs btrfs +contrib +device-mapper doc lxc overlay vim-syntax zsh-completion" # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND=" >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) " DEPEND=" ${CDEPEND} >=dev-lang/go-1.3 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) " # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies RDEPEND=" ${CDEPEND} !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0.7 ) aufs? ( || ( sys-fs/aufs3 sys-fs/aufs4 sys-kernel/aufs-sources ) ) " RESTRICT="installsources strip" # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" NAMESPACES NET_NS PID_NS IPC_NS UTS_NS DEVPTS_MULTIPLE_INSTANCES CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MACVLAN VETH BRIDGE NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK NF_NAT NF_NAT_NEEDED POSIX_MQUEUE ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED ~RESOURCE_COUNTERS ~CGROUP_PERF ~CFS_BANDWIDTH " 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" ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" pkg_setup() { if kernel_is lt 3 8; then eerror "" eerror "Using Docker with kernels older than 3.8 is unstable and unsupported." eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"; die 'Kernel is too old - need 3.8 or above' fi # for where these kernel versions come from, see: # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog* if ! { kernel_is ge 3 16 \ || { kernel_is 3 15 && kernel_is ge 3 15 5; } \ || { kernel_is 3 14 && kernel_is ge 3 14 12; } \ || { kernel_is 3 12 && kernel_is ge 3 12 25; } }; then ewarn "" ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+" ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)" ewarn "" ewarn "See also https://github.com/docker/docker/issues/2960"; fi if use aufs; then CONFIG_CHECK+=" ~AUFS_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY " # TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this # an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone 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 ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY " fi if use overlay; then CONFIG_CHECK+=" ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL " fi linux-info_pkg_setup } src_prepare() { # allow user patches (use sparingly - upstream won't support them) epatch_user } 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/$(get_libdir)" # 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 overlay; do if ! use $gd; then DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" fi done # time to build! ./hack/make.sh dynbinary || die 'dynbinary failed' # TODO get go-md2man and then include the man pages using docs/man/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,socket} 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 mkdir -p "${D}/usr/share/${PN}/contrib" cp -R contrib/* "${D}/usr/share/${PN}/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 " usermod -aG docker youruser" elog "" }
