From 9940b32d8cd7a5e3f201544bbb889d993c557469 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sat, 14 Nov 2026 19:51:35 +0100 Subject: [PATCH] migrate to native s6-overlay v3 services --- .github/workflows/test.yml | 13 +++++++ Dockerfile | 5 +-- rootfs/etc/cont-init.d/01-fix-uidgid.sh | 13 ------- .../s6-rc.d/config/dependencies.d/base | 0 rootfs/etc/s6-overlay/s6-rc.d/config/type | 1 + rootfs/etc/s6-overlay/s6-rc.d/config/up | 10 ++++++ .../s6-rc.d/cron/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/cron/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/cron/type | 1 + .../s6-rc.d/dispatcher/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run | 4 +++ rootfs/etc/s6-overlay/s6-rc.d/dispatcher/type | 1 + .../s6-rc.d/nginx/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/nginx/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/nginx/type | 1 + .../s6-rc.d/php-fpm/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type | 1 + .../s6-rc.d/snmpd/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/snmpd/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/snmpd/type | 1 + .../s6-rc.d/snmptrapd/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/type | 1 + .../s6-rc.d/syslogng/dependencies.d/config | 0 rootfs/etc/s6-overlay/s6-rc.d/syslogng/run | 3 ++ rootfs/etc/s6-overlay/s6-rc.d/syslogng/type | 1 + .../scripts/config} | 3 +- .../scripts/config-cron} | 17 +++------ .../scripts/config-dispatcher} | 16 ++------- .../scripts/config-main} | 31 ++-------------- .../scripts/config-snmptrapd} | 12 +------ .../scripts/config-syslogng} | 12 +------ .../scripts/fix-logs} | 3 +- .../scripts/fix-perms} | 3 +- rootfs/etc/s6-overlay/scripts/fix-uidgid | 12 +++++++ rootfs/etc/s6-overlay/scripts/runtime-bundles | 22 ++++++++++++ test/services.sh | 36 +++++++++++++++++++ 38 files changed, 141 insertions(+), 97 deletions(-) delete mode 100644 rootfs/etc/cont-init.d/01-fix-uidgid.sh create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/config/dependencies.d/base create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/config/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/config/up create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/cron/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/cron/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/cron/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/dispatcher/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/dispatcher/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/nginx/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nginx/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/php-fpm/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/snmpd/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/snmpd/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/snmpd/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/syslogng/dependencies.d/config create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/syslogng/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/syslogng/type rename rootfs/etc/{cont-init.d/03-config.sh => s6-overlay/scripts/config} (99%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/07-svc-cron.sh => s6-overlay/scripts/config-cron} (80%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/05-svc-dispatcher.sh => s6-overlay/scripts/config-dispatcher} (91%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/04-svc-main.sh => s6-overlay/scripts/config-main} (79%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/08-svc-snmptrapd.sh => s6-overlay/scripts/config-snmptrapd} (81%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/06-svc-syslogng.sh => s6-overlay/scripts/config-syslogng} (58%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/00-fix-logs.sh => s6-overlay/scripts/fix-logs} (67%) mode change 100644 => 100755 rename rootfs/etc/{cont-init.d/02-fix-perms.sh => s6-overlay/scripts/fix-perms} (88%) mode change 100644 => 100755 create mode 100755 rootfs/etc/s6-overlay/scripts/fix-uidgid create mode 100755 rootfs/etc/s6-overlay/scripts/runtime-bundles create mode 100644 test/services.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91d19e66..83c7b6fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,8 @@ on: env: BUILD_TAG: librenms:test CONTAINER_NAME: librenms + PUID: "1234" + PGID: "1235" jobs: test: @@ -71,6 +73,17 @@ jobs: name: ${{ env.CONTAINER_NAME }} log_check: "ready to handle connections" timeout: 120 + - + name: Check services + run: | + for service in librenms dispatcher syslogng snmptrapd; do + docker compose exec -T "$service" sh -s < services.sh + done + docker compose exec -T librenms curl --fail --retry 5 --retry-connrefused http://127.0.0.1:8000/login + working-directory: test + env: + LIBRENMS_IMAGE: ${{ env.BUILD_TAG }} + LIBRENMS_CONTAINER: ${{ env.CONTAINER_NAME }} - name: Logs if: always() diff --git a/Dockerfile b/Dockerfile index d1dc0fc4..f747f622 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG SYSLOGNG_VERSION="4.11.0-r0" FROM tianon/gosu:latest AS gosu -FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 +FROM alpine:${ALPINE_VERSION} COPY --from=gosu /gosu /usr/local/bin/ RUN apk --update --no-cache add \ busybox-extras \ @@ -70,7 +70,7 @@ RUN apk --update --no-cache add \ python3 \ py3-pip \ rrdtool \ - runit \ + s6-overlay \ sed \ shadow \ ttf-dejavu \ @@ -105,6 +105,7 @@ ARG SYSLOGNG_VERSION RUN apk --update --no-cache add syslog-ng=${SYSLOGNG_VERSION} ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \ + S6_STAGE2_HOOK="/etc/s6-overlay/scripts/runtime-bundles" \ LIBRENMS_PATH="/opt/librenms" \ LIBRENMS_DOCKER="1" \ TZ="UTC" \ diff --git a/rootfs/etc/cont-init.d/01-fix-uidgid.sh b/rootfs/etc/cont-init.d/01-fix-uidgid.sh deleted file mode 100644 index 44e7ab0d..00000000 --- a/rootfs/etc/cont-init.d/01-fix-uidgid.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/with-contenv sh -# shellcheck shell=sh -set -e - -if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g librenms)" ]; then - echo "Switching to PGID ${PGID}..." - sed -i -e "s/^librenms:\([^:]*\):[0-9]*/librenms:\1:${PGID}/" /etc/group - sed -i -e "s/^librenms:\([^:]*\):\([0-9]*\):[0-9]*/librenms:\1:\2:${PGID}/" /etc/passwd -fi -if [ -n "${PUID}" ] && [ "${PUID}" != "$(id -u librenms)" ]; then - echo "Switching to PUID ${PUID}..." - sed -i -e "s/^librenms:\([^:]*\):[0-9]*:\([0-9]*\)/librenms:\1:${PUID}:\2/" /etc/passwd -fi diff --git a/rootfs/etc/s6-overlay/s6-rc.d/config/dependencies.d/base b/rootfs/etc/s6-overlay/s6-rc.d/config/dependencies.d/base new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/config/type b/rootfs/etc/s6-overlay/s6-rc.d/config/type new file mode 100644 index 00000000..bdd22a18 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/config/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/config/up b/rootfs/etc/s6-overlay/s6-rc.d/config/up new file mode 100644 index 00000000..863cd21b --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/config/up @@ -0,0 +1,10 @@ +with-contenv +if { /etc/s6-overlay/scripts/fix-logs } +if { /etc/s6-overlay/scripts/fix-uidgid } +if { /etc/s6-overlay/scripts/fix-perms } +if { /etc/s6-overlay/scripts/config } +if { /etc/s6-overlay/scripts/config-main } +if { /etc/s6-overlay/scripts/config-dispatcher } +if { /etc/s6-overlay/scripts/config-syslogng } +if { /etc/s6-overlay/scripts/config-cron } +/etc/s6-overlay/scripts/config-snmptrapd diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cron/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/cron/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cron/run b/rootfs/etc/s6-overlay/s6-rc.d/cron/run new file mode 100755 index 00000000..6a6dff27 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/cron/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec busybox crond -f -L /dev/stdout -c /var/spool/cron/crontabs diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cron/type b/rootfs/etc/s6-overlay/s6-rc.d/cron/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/cron/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run new file mode 100755 index 00000000..1283176a --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/run @@ -0,0 +1,4 @@ +#!/command/with-contenv sh + +cd /opt/librenms || exit 1 +exec s6-setuidgid "${PUID}:${PGID}" execlineb -c "./librenms-service.py ${DISPATCHER_ARGS}" diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/type b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dispatcher/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run new file mode 100755 index 00000000..fe538835 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec s6-setuidgid "${PUID}:${PGID}" nginx -g "daemon off;" diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run new file mode 100755 index 00000000..8cb98bd2 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec s6-setuidgid "${PUID}:${PGID}" php-fpm84 -F diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmpd/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/snmpd/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmpd/run b/rootfs/etc/s6-overlay/s6-rc.d/snmpd/run new file mode 100755 index 00000000..5bf0e5c4 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/snmpd/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec /usr/sbin/snmpd -f -Lo -c /etc/snmp/snmpd.conf diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmpd/type b/rootfs/etc/s6-overlay/s6-rc.d/snmpd/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/snmpd/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/run b/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/run new file mode 100755 index 00000000..dd9f5745 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec /usr/sbin/snmptrapd -f -Lo -m ALL -M "/opt/librenms/mibs:/opt/librenms/mibs/cisco:${SNMP_EXTRA_MIB_DIRS}" udp:162 tcp:162 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/type b/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/snmptrapd/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/syslogng/dependencies.d/config b/rootfs/etc/s6-overlay/s6-rc.d/syslogng/dependencies.d/config new file mode 100644 index 00000000..e69de29b diff --git a/rootfs/etc/s6-overlay/s6-rc.d/syslogng/run b/rootfs/etc/s6-overlay/s6-rc.d/syslogng/run new file mode 100755 index 00000000..5a9f6663 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/syslogng/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec /usr/sbin/syslog-ng -F diff --git a/rootfs/etc/s6-overlay/s6-rc.d/syslogng/type b/rootfs/etc/s6-overlay/s6-rc.d/syslogng/type new file mode 100644 index 00000000..5883cff0 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/syslogng/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/s6-overlay/scripts/config old mode 100644 new mode 100755 similarity index 99% rename from rootfs/etc/cont-init.d/03-config.sh rename to rootfs/etc/s6-overlay/scripts/config index 5b02a259..f1458afd --- a/rootfs/etc/cont-init.d/03-config.sh +++ b/rootfs/etc/s6-overlay/scripts/config @@ -1,5 +1,4 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash +#!/bin/bash set -e # From https://github.com/docker-library/mariadb/blob/master/docker-entrypoint.sh#L21-L41 diff --git a/rootfs/etc/cont-init.d/07-svc-cron.sh b/rootfs/etc/s6-overlay/scripts/config-cron old mode 100644 new mode 100755 similarity index 80% rename from rootfs/etc/cont-init.d/07-svc-cron.sh rename to rootfs/etc/s6-overlay/scripts/config-cron index 96ffc70b..c4c449aa --- a/rootfs/etc/cont-init.d/07-svc-cron.sh +++ b/rootfs/etc/s6-overlay/scripts/config-cron @@ -1,5 +1,4 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash +#!/bin/bash set -e CRONTAB_PATH="/var/spool/cron/crontabs" @@ -18,7 +17,7 @@ fi # Init rm -rf ${CRONTAB_PATH} -mkdir -m 0644 -p ${CRONTAB_PATH} +mkdir -p ${CRONTAB_PATH} touch ${CRONTAB_PATH}/librenms # Cron @@ -35,13 +34,5 @@ echo "* * * * * php /opt/librenms/artisan schedule:run --no-ansi --no-interactio # Fix perms echo "Fixing crontabs permissions..." -chmod -R 0644 ${CRONTAB_PATH} - -# Create service -mkdir -p /etc/services.d/cron -cat >/etc/services.d/cron/run </etc/services.d/dispatcher/run </etc/services.d/nginx/run </etc/services.d/php-fpm/run </etc/services.d/snmpd/run </etc/services.d/snmptrapd/run <>" mkdir -p /data/syslog-ng /run/syslog-ng chown librenms:librenms /data/syslog-ng chown -R librenms:librenms /run/syslog-ng - -# Create service -mkdir -p /etc/services.d/syslogng -cat >/etc/services.d/syslogng/run <