[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-registry/, app-emulation/docker-registry/files/

[Zac Medico]

commit:     0eea13ca58aba2306a979fdc0bd307bccedbfe60
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 22:09:01 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 22:13:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eea13ca

app-emulation/docker-registry: revbump to 2.6.2-r1 for bug 629202

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 ...y-2.6.2.ebuild => docker-registry-2.6.2-r1.ebuild} |  0
 app-emulation/docker-registry/files/registry.initd    | 19 +++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app-emulation/docker-registry/docker-registry-2.6.2.ebuild b/app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild
similarity index 100%
rename from app-emulation/docker-registry/docker-registry-2.6.2.ebuild
rename to app-emulation/docker-registry/docker-registry-2.6.2-r1.ebuild

diff --git a/app-emulation/docker-registry/files/registry.initd b/app-emulation/docker-registry/files/registry.initd
index 43637a9dbe8..b81303c624d 100644
--- a/app-emulation/docker-registry/files/registry.initd
+++ b/app-emulation/docker-registry/files/registry.initd
@@ -1,24 +1,19 @@
 #!/sbin/openrc-run
-# Copyright 2016 Gentoo Foundation
+# Copyright 2016-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Docker Registry 2.0"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
 
-command="/usr/libexec/docker-${SVCNAME}/${SVCNAME}"
+command="/usr/libexec/docker-${RC_SVCNAME}/${RC_SVCNAME}"
 command_args="${command_args:-serve /etc/docker/registry/config.yml}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
 depend() {
 	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
 }