Merge pull request #72 from gizmoguy/docker-init-script

Update docker init script for docker-in-docker
faucetsdn · Jan 26, 2024 · 1562fa4 · 1562fa4
2 parents fb49a42 + c629ed3
commit 1562fa4
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 109 deletions.
diff --git a/bin/dind.sh b/bin/dind.sh
@@ -12,6 +12,7 @@ case "${arch}" in
         echo "deb [arch=${arch} signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
         ${AG} update
         ${AG} install docker-ce
+        mv "${BUILD_DIR}/docker.init.d" /etc/init.d/docker
     ;;
     i386)
         ${AG} install docker.io

diff --git a/etc/init.d/docker b/etc/init.d/docker
@@ -35,122 +35,83 @@ DOCKER_DESC="Docker"
 . /lib/lsb/init-functions
 
 if [ -f /etc/default/$BASE ]; then
-	. /etc/default/$BASE
+        . /etc/default/$BASE
 fi
 
 # Check docker is present
 if [ ! -x $DOCKERD ]; then
-	log_failure_msg "$DOCKERD not present or not executable"
-	exit 1
+        log_failure_msg "$DOCKERD not present or not executable"
+        exit 1
 fi
 
-check_init() {
-	# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly)
-	if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then
-		log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1"
-		exit 1
-	fi
-}
-
 fail_unless_root() {
-	if [ "$(id -u)" != '0' ]; then
-		log_failure_msg "$DOCKER_DESC must be run as root"
-		exit 1
-	fi
-}
-
-cgroupfs_mount() {
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		return
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
+        if [ "$(id -u)" != '0' ]; then
+                log_failure_msg "$DOCKER_DESC must be run as root"
+                exit 1
+        fi
 }
 
 case "$1" in
-	start)
-		check_init
-
-		fail_unless_root
-
-		cgroupfs_mount
-
-		touch "$DOCKER_LOGFILE"
-		chgrp docker "$DOCKER_LOGFILE"
-
-		ulimit -n 1048576
-
-		# Having non-zero limits causes performance problems due to accounting overhead
-		# in the kernel. We recommend using cgroups to do container-local accounting.
-		if [ "$BASH" ]; then
-			ulimit -u unlimited
-		else
-			ulimit -p unlimited
-		fi
-
-		log_begin_msg "Starting $DOCKER_DESC: $BASE"
-		start-stop-daemon --start --background \
-			--no-close \
-			--exec "$DOCKERD" \
-			--pidfile "$DOCKER_SSD_PIDFILE" \
-			--make-pidfile \
-			-- \
-				-p "$DOCKER_PIDFILE" \
-				$DOCKER_OPTS \
-					>> "$DOCKER_LOGFILE" 2>&1
-		log_end_msg $?
-		;;
-
-	stop)
-		check_init
-		fail_unless_root
-		if [ -f "$DOCKER_SSD_PIDFILE" ]; then
-			log_begin_msg "Stopping $DOCKER_DESC: $BASE"
-			start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10
-			log_end_msg $?
-		else
-			log_warning_msg "Docker already stopped - file $DOCKER_SSD_PIDFILE not found."
-		fi
-		;;
-
-	restart)
-		check_init
-		fail_unless_root
-		docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null`
-		[ -n "$docker_pid" ] \
-			&& ps -p $docker_pid > /dev/null 2>&1 \
-			&& $0 stop
-		$0 start
-		;;
-
-	force-reload)
-		check_init
-		fail_unless_root
-		$0 restart
-		;;
-
-	status)
-		check_init
-		status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKERD" "$DOCKER_DESC"
-		;;
-
-	*)
-		echo "Usage: service docker {start|stop|restart|status}"
-		exit 1
-		;;
-esac
+        start)
+                fail_unless_root
+
+                touch "$DOCKER_LOGFILE"
+                chgrp docker "$DOCKER_LOGFILE"
+
+                ulimit -n 524288
+
+                # Having non-zero limits causes performance problems due to accounting overhead
+                # in the kernel. We recommend using cgroups to do container-local accounting.
+                if [ "$BASH" ]; then
+                        ulimit -u unlimited
+                else
+                        ulimit -p unlimited
+                fi
+
+                log_begin_msg "Starting $DOCKER_DESC: $BASE"
+                start-stop-daemon --start --background \
+                        --no-close \
+                        --exec "$DOCKERD" \
+                        --pidfile "$DOCKER_SSD_PIDFILE" \
+                        --make-pidfile \
+                        -- \
+                        -p "$DOCKER_PIDFILE" \
+                        $DOCKER_OPTS \
+                        >> "$DOCKER_LOGFILE" 2>&1
+                log_end_msg $?
+                ;;
+
+        stop)
+                fail_unless_root
+                if [ -f "$DOCKER_SSD_PIDFILE" ]; then
+                        log_begin_msg "Stopping $DOCKER_DESC: $BASE"
+                        start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10
+                        log_end_msg $?
+                else
+                        log_warning_msg "Docker already stopped - file $DOCKER_SSD_PIDFILE not found."
+                fi
+                ;;
+
+        restart)
+                fail_unless_root
+                docker_pid=$(cat "$DOCKER_SSD_PIDFILE" 2> /dev/null || true)
+                [ -n "$docker_pid" ] \
+                        && ps -p $docker_pid > /dev/null 2>&1 \
+                        && $0 stop
+                $0 start
+                ;;
+
+        force-reload)
+                fail_unless_root
+                $0 restart
+                ;;
+
+        status)
+                status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKERD" "$DOCKER_DESC"
+                ;;
+
+        *)
+                echo "Usage: service docker {start|stop|restart|status}"
+                exit 1
+                ;;
+        esac