Skip to contentSkip to conversation

package/docker-engine: add sysv init script

PATCH New Peter Korsgaard 2 participants 3 messages Jan 30, 2019 – Jan 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/docker-engine: add sysv init script

---
 package/docker-engine/S60dockerd       | 38 ++++++++++++++++++++++++++++++++++
 package/docker-engine/docker-engine.mk |  5 +++++
 2 files changed, 43 insertions(+)
 create mode 100755 package/docker-engine/S60dockerd
package/docker-engine/S60dockerd new file +38 -0
new file mode 100755
index 0000000000..def8bea149
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+NAME=dockerd
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS=""
+
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME $1
+
+do_start() {
+        echo -n "Starting $NAME: "
+        start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
+                && echo "OK" || echo "FAIL"
+}
+
+do_stop() {
+        echo -n "Stopping $NAME: "
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                && echo "OK" || echo "FAIL"
+}
+
+case "$1" in
+        start)
+                do_start
+                ;;
+        stop)
+                do_stop
+                ;;
+        restart)
+                do_stop
+                sleep 1
+                do_start
+                ;;
+	*)
+                echo "Usage: $0 {start|stop|restart}"
+                exit 1
+esac
package/docker-engine/docker-engine.mk +5 -0
index f19c1d995c..aae44ab6df 100644
@@ -73,6 +73,11 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service
 endef
 
+define DOCKER_ENGINE_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/docker-engine/S60dockerd \
+		$(TARGET_DIR)/etc/init.d/S60dockerd
+endef
+
 define DOCKER_ENGINE_USERS
 	- - docker -1 * - - - Docker Application Container Framework
 endef
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/docker-engine: add sysv init script

Hi Peter,

package/docker-engine/S60dockerd line 6

Quoted 8 lines · Peter Korsgaard

+++ b/package/docker-engine/S60dockerd

package/docker-engine/S60dockerd new file +6 -0
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+NAME=dockerd
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS=""

We pull the systemd unit file from /contrib/init/systemd/docker.service within the docker-engine codebase.

There also exists /contrib/init/openrc as well as sysvinit-debian, sysvinit-redhat, and upstart. I guess none of these are suitable for the sysv init system.

package/docker-engine/docker-engine.mk define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD · line 79

Quoted 4 lines
package/docker-engine/docker-engine.mk +4 -0
+define DOCKER_ENGINE_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/docker-engine/S60dockerd \
+		$(TARGET_DIR)/etc/init.d/S60dockerd
+endef

In general LGTM.

Best,
Christian

#2 lore raw

PATCH 1/1 package/docker-engine: add sysv init script

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

Hi Peter,

package/docker-engine/S60dockerd line 6

Quoted 8 lines · Peter Korsgaard

+++ b/package/docker-engine/S60dockerd

package/docker-engine/S60dockerd new file +6 -0
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+NAME=dockerd
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS=""

We pull the systemd unit file from /contrib/init/systemd/docker.service within the docker-engine codebase.

Quoted 3 lines

There also exists /contrib/init/openrc as well as sysvinit-debian, sysvinit-redhat, and upstart. I guess none of these are suitable for the sysv init system.

Yes, but those all look very complicated and/or does more than we want, E.G. handling the croupfs mounts which we do in S30cgroupfs.

Quoted 8 lines

package/docker-engine/docker-engine.mk define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD · line 79

Quoted 4 lines
package/docker-engine/docker-engine.mk +4 -0
+define DOCKER_ENGINE_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/docker-engine/S60dockerd \
+		$(TARGET_DIR)/etc/init.d/S60dockerd
+endef

In general LGTM.

Thanks.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard