Merge branch 'feature/s6-overlay'

Author: djbe

common/Dockerfile

@@ -8,17 +8,20 @@ FROM alpine:${ALPINE_VERSION} AS base
 # Install packages
 # hadolint ignore=DL3018
 RUN apk add --no-cache \
-    supervisor
+    s6-overlay
 
 # Copy files
-COPY config/supervisor/supervisord.conf /etc/supervisor/
+COPY config/s6-overlay /etc/s6-overlay/s6-rc.d/
 COPY scripts /scripts/
 
+# S6-overlay configuration
+ENV S6_LINUX_INIT=0
+ENV S6_VERBOSITY=0
+ENV S6_KILL_GRACETIME=1000
+
 # Clean Up
 WORKDIR /app/www
-RUN chown -R nobody:nobody \
-    /app/www \
-    /run \
+RUN chown -R nobody:nobody /app/www \
   && addgroup nobody tty
 
 ENTRYPOINT ["/scripts/docker-entrypoint.sh"]
@@ -37,14 +40,9 @@ RUN apk add --no-cache \
 
 # Copy files
 COPY config/nginx/ /etc/nginx/
-COPY config/supervisor/conf.d/nginx.conf /etc/supervisor/conf.d/
 
-# Clean Up
+# Remove unneeded nginx site and enable service
 RUN rm -f /etc/nginx/conf.d/default.conf \
-  && chown -R nobody:nobody \
-    /etc/nginx/site-mods-enabled.d \
-    /etc/nginx/snippets/vars/ \
-    /var/lib/nginx \
-    /var/log/nginx
+  && touch /etc/s6-overlay/s6-rc.d/user/contents.d/nginx
 
 EXPOSE 8080

common/config/s6-overlay/nginx/dependencies.d/startup-scripts

@@ -0,0 +1 @@
+SIGQUIT

common/config/s6-overlay/nginx/down-signal

@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -P
+s6-setuidgid nobody
+nginx

common/config/s6-overlay/nginx/run

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

common/config/s6-overlay/nginx/type

@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+set -euo pipefail
+
+# Set defaults
+SECRET_DIR=/secrets
+
+# Correct permissions so we can run as `nobody`
+EXTRA_DIRS=
+[ -d /var/lib/nginx ] && EXTRA_DIRS="$EXTRA_DIRS /var/lib/nginx"
+[ -d /var/log/nginx ] && EXTRA_DIRS="$EXTRA_DIRS /var/log/nginx"
+chown nobody:nogroup \
+  /dev/stdout \
+  /dev/stderr \
+  /run \
+  $EXTRA_DIRS
+
+# Ensure our working path is correct
+OLD_PWD="$PWD"
+if [ -d /app/www ]; then
+  cd /app/www
+fi
+
+# Execute individual startup scripts
+for script in /scripts/startup/*.sh; do
+  s6-envdir -I "$SECRET_DIR" $script
+done
+
+# Cleanup
+cd "$OLD_PWD"

common/config/s6-overlay/startup-scripts/data/run.sh

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

common/config/s6-overlay/startup-scripts/dependencies.d/base

@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -P
+with-contenv
+/etc/s6-overlay/s6-rc.d/startup-scripts/data/run.sh