testing/docker-registry: Simplify init script, run as dedicated user

1 files changed, 10 insertions, 20 deletions

diff --git a/testing/docker-registry/docker-registry.initd b/testing/docker-registry/docker-registry.initd
index 0f0e34fb7d9..47064077eda 100644
--- a/testing/docker-registry/docker-registry.initd
+++ b/testing/docker-registry/docker-registry.initd
@@ -1,30 +1,20 @@
 #!/sbin/openrc-run
 # $Header: $
 
-DOCKER_REGISTRY_LOGFILE=${DOCKER_REGISTRY_LOGFILE:-/var/log/${SVCNAME}.log}
 DOCKER_REGISTRY_PIDFILE=${DOCKER_REGISTRY_PIDFILE:-/run/${SVCNAME}.pid}
 DOCKER_REGISTRY_BINARY=${DOCKER_REGISTRY_BINARY:-/usr/bin/docker-registry}
 DOCKER_REGISTRY_CONFIG=${DOCKER_REGISTRY_CONFIG:-/etc/docker-registry/config.yml}
+DOCKER_REGISTRY_LOGFILE=${DOCKER_REGISTRY_LOGFILE:-/var/log/docker-registry.log}
 
-start() {
-	checkpath -f -m 0644 -o root:docker "$DOCKER_REGISTRY_LOGFILE"
+command="$DOCKER_REGISTRY_BINARY"
+command_args="$DOCKER_REGISTRY_CONFIG"
+pidfile="$DOCKER_REGISTRY_PIDFILE"
+command_background="true"
+start_stop_daemon_args="--user docker-registry:docker-registry --stdout $DOCKER_REGISTRY_LOGFILE --stderr $DOCKER_REGISTRY_LOGFILE"
+name="Docker Registry"
 
-	ebegin "Starting docker registry"
-	start-stop-daemon --start --background \
-		--exec "$DOCKER_REGISTRY_BINARY" \
-		--pidfile "$DOCKER_PIDFILE" \
-    --make-pid \
-    --background \
-		--stdout "$DOCKER_LOGFILE" \
-		--stderr "$DOCKER_LOGFILE" \
-		-- "$DOCKER_REGISTRY_CONFIG"
-	eend $?
-}
+start_pre() {
+	checkpath --directory --owner docker-registry:docker-registry --mode 0770 /var/lib/registry
 
-stop() {
-	ebegin "Stopping docker daemon"
-	start-stop-daemon --stop \
-		--exec "$DOCKER_BINARY" \
-		--pidfile "$DOCKER_PIDFILE"
-	eend $?
+	checkpath -f -m 0644 -o docker-registry:docker-registry "$DOCKER_REGISTRY_LOGFILE"
 }