Updated to latest s6-overlay

docker/rootfs/etc/cont-finish.d/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

docker/rootfs/etc/cont-init.d/10-nginx

@@ -1,18 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Create required folders
-mkdir -p /tmp/nginx/body \
-	/run/nginx \
-	/var/log/nginx \
-	/var/lib/nginx/cache/public \
-	/var/lib/nginx/cache/private \
-	/var/cache/nginx/proxy_temp \
-	/data/logs
-
-touch /var/log/nginx/error.log && chmod 777 /var/log/nginx/error.log && chmod -R 777 /var/cache/nginx
-
-# Dynamically generate resolvers file
-echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)" ";" > /etc/nginx/conf.d/include/resolvers.conf
-
-# Fire off acme.sh wrapper script to "install" itself if required
-acme.sh -h > /dev/null 2>&1

docker/rootfs/etc/cont-init.d/20-adduser

@@ -1,33 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-PUID=${PUID:-911}
-PGID=${PGID:-911}
-
-groupmod -g 1000 users || exit 1
-useradd -u "${PUID}" -U -d /data -s /bin/false npmuser || exit 1
-usermod -G users npmuser || exit 1
-groupmod -o -g "$PGID" npmuser || exit 1
-
-echo "-------------------------------------
- _   _ ____  __  __
-| \ | |  _ \|  \/  |
-|  \| | |_) | |\/| |
-| |\  |  __/| |  | |
-|_| \_|_|   |_|  |_|
--------------------------------------
-User UID: $(id -u npmuser)
-User GID: $(id -g npmuser)
--------------------------------------
-"
-
-chown -R npmuser:npmuser /data
-chown -R npmuser:npmuser /run/nginx
-chown -R npmuser:npmuser /etc/nginx
-chown -R npmuser:npmuser /tmp/nginx
-chown -R npmuser:npmuser /var/cache/nginx
-chown -R npmuser:npmuser /var/lib/nginx
-chown -R npmuser:npmuser /var/log/nginx
-
-# Home for npmuser
-mkdir -p /tmp/npmuserhome
-chown -R npmuser:npmuser /tmp/npmuserhome

docker/rootfs/etc/fix-attrs.d/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

docker/rootfs/etc/s6-overlay/s6-rc.d/backend/run

@@ -1,9 +1,7 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
+set -e
 
-RESET='\E[0m'
-YELLOW='\E[1;33m'
-
-echo -e "${YELLOW}Starting backend API ...${RESET}"
+echo "❯ Starting backend ..."
 
 if [ "$DEVELOPMENT" == "true" ]; then
 	HOME=/tmp/npmuserhome
@@ -13,12 +11,8 @@ if [ "$DEVELOPMENT" == "true" ]; then
 	export HOME GOPATH
 	rm -rf /app/backend/.task
 	cd /app/backend || exit 1
-	s6-setuidgid npmuser task -w
+	exec s6-setuidgid npmuser task -w
 else
 	cd /app/bin || exit 1
-	while :
-	do
-		s6-setuidgid npmuser /app/bin/server
-		sleep 1
-	done
+	exec s6-setuidgid npmuser /app/bin/server
 fi

docker/rootfs/etc/s6-overlay/s6-rc.d/backend/type

@@ -0,0 +1 @@
+longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/frontend/run

@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
+set -e
 
 # This service is DEVELOPMENT only.
 
@@ -9,7 +10,7 @@ if [ "$DEVELOPMENT" == "true" ]; then
 	export HOME
 	cd /app/frontend || exit 1
 	s6-setuidgid npmuser yarn install
-	s6-setuidgid npmuser yarn start
+	exec s6-setuidgid npmuser yarn start
 else
 	exit 0
 fi

docker/rootfs/etc/s6-overlay/s6-rc.d/frontend/type

@@ -0,0 +1 @@
+longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/run

@@ -0,0 +1,5 @@
+#!/command/with-contenv bash
+set -e
+
+echo "❯ Starting nginx ..."
+exec s6-setuidgid npmuser nginx

docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/type

@@ -0,0 +1 @@
+longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/script.sh

@@ -0,0 +1,61 @@
+#!/command/with-contenv bash
+set -e
+
+DATA_PATH=/data
+PUID=${PUID:-911}
+PGID=${PGID:-911}
+
+# Ensure /data is mounted
+if [ ! -d "$DATA_PATH" ]; then
+	echo '--------------------------------------'
+	echo "ERROR: $DATA_PATH is not mounted! Check your docker configuration."
+	echo '--------------------------------------'
+	/run/s6/basedir/bin/halt
+	exit 1
+fi
+
+echo "❯ Checking folder structure ..."
+
+# Create required folders
+mkdir -p /tmp/nginx/body \
+	/run/nginx \
+	/var/log/nginx \
+	/var/lib/nginx/cache/public \
+	/var/lib/nginx/cache/private \
+	/var/cache/nginx/proxy_temp \
+	/data/logs
+touch /var/log/nginx/error.log && chmod 777 /var/log/nginx/error.log && chmod -R 777 /var/cache/nginx
+# Dynamically generate resolvers file
+echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)" ";" > /etc/nginx/conf.d/include/resolvers.conf
+# Fire off acme.sh wrapper script to "install" itself if required
+acme.sh -h > /dev/null 2>&1
+
+# Add npmuser user
+echo "❯ Creating user ..."
+groupmod -g 1000 users || exit 1
+useradd -u "${PUID}" -U -d /data -s /bin/false npmuser || exit 1
+usermod -G users npmuser || exit 1
+groupmod -o -g "$PGID" npmuser || exit 1
+chown -R npmuser:npmuser /data
+chown -R npmuser:npmuser /run/nginx
+chown -R npmuser:npmuser /etc/nginx
+chown -R npmuser:npmuser /tmp/nginx
+chown -R npmuser:npmuser /var/cache/nginx
+chown -R npmuser:npmuser /var/lib/nginx
+chown -R npmuser:npmuser /var/log/nginx
+# Home for npmuser
+mkdir -p /tmp/npmuserhome
+chown -R npmuser:npmuser /tmp/npmuserhome
+
+echo
+echo "-------------------------------------
+ _   _ ____  __  __
+| \ | |  _ \|  \/  |
+|  \| | |_) | |\/| |
+| |\  |  __/| |  | |
+|_| \_|_|   |_|  |_|
+-------------------------------------
+User UID: $(id -u npmuser)
+User GID: $(id -g npmuser)
+-------------------------------------
+"

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/type

@@ -0,0 +1 @@
+oneshot

docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/prepare/script.sh

docker/rootfs/etc/services.d/backend/finish

@@ -1,5 +0,0 @@
-#!/usr/bin/execlineb -S1
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services

docker/rootfs/etc/services.d/frontend/finish

@@ -1,5 +0,0 @@
-#!/usr/bin/execlineb -S1
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services

docker/rootfs/etc/services.d/nginx/finish

@@ -1,6 +0,0 @@
-#!/usr/bin/execlineb -S1
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
-
-s6-svscanctl -t /var/run/s6/services
-

docker/rootfs/etc/services.d/nginx/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-exec s6-setuidgid npmuser nginx