Refactor supervisor to s6-overlay

Author: nedix

Containerfile

@@ -1,44 +1,64 @@
 ARG DEBIAN_VERSION=bookworm
 ARG EASY_NOVNC_VERSION=v1.1.0
 ARG GO_VERSION=1.23
+ARG S6_OVERLAY_VERSION=3.2.0.0
+ARG STARTUP_TIMEOUT=30
 
-FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS build-easy-novnc
+FROM debian:${DEBIAN_VERSION}-slim AS base
+
+ARG S6_OVERLAY_VERSION
+
+ARG BUILD_DEPS=" \
+    wget \
+    xz-utils \
+"
+
+RUN apt update -y \
+    && apt install -y $BUILD_DEPS \
+    && case "$(uname -m)" in \
+        aarch64|arm*) \
+            S6_OVERLAY_ARCHITECTURE="aarch64" \
+        ;; x86_64) \
+            S6_OVERLAY_ARCHITECTURE="x86_64" \
+        ;; *) echo "Unsupported architecture: $(uname -m)"; exit 1; ;; \
+    esac \
+    && wget -qO- "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" \
+    | tar -xpJf- -C / \
+    && wget -qO- "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCHITECTURE}.tar.xz" \
+    | tar -xpJf- -C / \
+    && apt remove -y $BUILD_DEPS
+
+FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS easy-novnc
 
 ARG EASY_NOVNC_VERSION
 
-WORKDIR /src
+WORKDIR /build/easy-novnc/
 
 RUN go mod init build \
     && go get github.com/geek1011/easy-novnc@${EASY_NOVNC_VERSION} \
-    && go build -o /bin/easy-novnc github.com/geek1011/easy-novnc
+    && go build -o /build/easy-novnc/bin/ github.com/geek1011/easy-novnc
 
-FROM debian:${DEBIAN_VERSION}-slim
+FROM base
 
-RUN apt update \
-    && apt install -y --no-install-recommends \
+RUN apt update -y \
+    && apt install -y \
         breeze \
-        ca-certificates \
         dbus-x11 \
-        gosu \
         graphviz \
         kcachegrind \
         openbox \
-        supervisor \
         tigervnc-standalone-server \
-        xdg-utils \
-    && rm -rf /var/lib/apt/lists \
-    && mkdir -p /usr/share/desktop-directories
+        xdg-utils
+
+COPY --from=easy-novnc /build/easy-novnc/bin/ /usr/local/bin/
 
-COPY --from=build-easy-novnc /bin/easy-novnc /usr/local/bin/
+COPY /rootfs/ /
 
-ADD rootfs /
+ARG STARTUP_TIMEOUT
+ENV STARTUP_TIMEOUT="$STARTUP_TIMEOUT"
 
-RUN groupadd --gid 1000 app \
-    && useradd --home-dir /data --shell /bin/bash --uid 1000 --gid 1000 app \
-    && mkdir -p /data
+ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 80
 
 VOLUME /data
-
-CMD ["sh", "-c", "chown app:app /data /dev/stdout && exec gosu app supervisord"]

Makefile

@@ -3,5 +3,5 @@ setup:
 
 up: PORT = 8080
 up:
-	@docker run --rm -p $(PORT):80 --name kcachegrind \
+	@docker run --rm -p $(PORT):6080 --name kcachegrind \
 		kcachegrind

rootfs/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+: ${STARTUP_TIMEOUT}
+
+exec env -i \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME="$(( $STARTUP_TIMEOUT * 1000 ))" \
+    S6_STAGE2_HOOK="/usr/sbin/s6-stage2-hook" \
+    /init

rootfs/etc/s6-overlay/s6-rc.d/easy-novnc/dependencies.d/xvnc

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+exec /usr/local/bin/easy-novnc \
+    --addr=":6080" \
+    --host="127.0.0.1" \
+    --no-url-password \
+    --novnc-params="resize=remote" \
+    --port="5900"

rootfs/etc/s6-overlay/s6-rc.d/easy-novnc/run

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

rootfs/etc/s6-overlay/s6-rc.d/easy-novnc/type

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+export $(/usr/bin/dbus-launch)
+export DISPLAY=:0
+export HOME=/data
+
+exec /usr/bin/kcachegrind

rootfs/etc/s6-overlay/s6-rc.d/kcachegrind/dependencies.d/openbox

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