summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-12-31 16:46:51 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-12-31 16:46:51 +0000
commitb8f3c85982ea46050116a4be77a5b6c7d85c50bc (patch)
tree1e6aa6da93a9fad440dd82898990c1b4bc11369d /app-emulation/docker
parentDo not die when something in FILESDIR is missing. (diff)
downloadgentoo-2-b8f3c85982ea46050116a4be77a5b6c7d85c50bc.tar.gz
gentoo-2-b8f3c85982ea46050116a4be77a5b6c7d85c50bc.tar.bz2
gentoo-2-b8f3c85982ea46050116a4be77a5b6c7d85c50bc.zip
[QA] Remove unused files. Added proxy-maintainers to metadata.xml due to non-gorg e-mail address.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-emulation/docker')
-rw-r--r--app-emulation/docker/ChangeLog7
-rwxr-xr-xapp-emulation/docker/files/docker.initd31
-rw-r--r--app-emulation/docker/metadata.xml9
3 files changed, 11 insertions, 36 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index cd4b635617a5..bbbb79eeb1ff 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/docker
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.8 2013/12/17 02:50:41 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.9 2013/12/31 16:46:51 tomwij Exp $
+
+ 31 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/docker.initd,
+ metadata.xml:
+ [QA] Remove unused files. Added proxy-maintainers to metadata.xml due to non-
+ gorg e-mail address.
*docker-0.7.2 (17 Dec 2013)
*docker-0.7.1-r1 (17 Dec 2013)
diff --git a/app-emulation/docker/files/docker.initd b/app-emulation/docker/files/docker.initd
deleted file mode 100755
index 55f2277ad5e4..000000000000
--- a/app-emulation/docker/files/docker.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker.initd,v 1.1 2013/09/25 03:22:15 gregkh Exp $
-
-DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log}
-DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid}
-DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker}
-
-start() {
- touch "$DOCKER_LOGFILE"
- chown root:docker "$DOCKER_LOGFILE"
- chmod 0644 "$DOCKER_LOGFILE"
-
- ebegin "Starting docker daemon"
- start-stop-daemon --start --background \
- --exec "$DOCKER_BINARY" \
- --pidfile "$DOCKER_PIDFILE" \
- --stdout "$DOCKER_LOGFILE" \
- --stderr "$DOCKER_LOGFILE" \
- -- -d -p "$DOCKER_PIDFILE"
- eend $?
-}
-
-stop() {
- ebegin "Stopping docker daemon"
- start-stop-daemon --stop \
- --exec "$DOCKER_BINARY" \
- --pidfile "$DOCKER_PIDFILE"
- eend $?
-}
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 76763946835a..ccbaf0cfbb80 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -1,6 +1,11 @@
<?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
@@ -8,10 +13,6 @@
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