From 5e39010543c3dcac7ff1dfb414c1691cdacf72e9 Mon Sep 17 00:00:00 2001 From: Aditya Tripathi Date: Tue, 13 Oct 2026 08:27:33 +0000 Subject: [PATCH] fix(dev): define the s6 user bundle in user-bundles.d The serversideup/php base image now defines its user bundle (nginx, php-fpm) in /etc/s6-overlay/user-bundles.d. A bundle in s6-rc.d/user has priority over it, so the dev container started without nginx and php-fpm and did not become healthy. --- .../{s6-rc.d => user-bundles.d}/user/contents.d/horizon | 0 .../{s6-rc.d => user-bundles.d}/user/contents.d/init-setup | 0 .../s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/reverb | 0 .../{s6-rc.d => user-bundles.d}/user/contents.d/scheduler-worker | 0 .../{s6-rc.d => user-bundles.d}/user/contents.d/terminal-server | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/horizon (100%) rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/init-setup (100%) rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/reverb (100%) rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/scheduler-worker (100%) rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/terminal-server (100%) diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/horizon b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/horizon similarity index 100% rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/horizon rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/horizon diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/init-setup similarity index 100% rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/init-setup diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/reverb b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/reverb similarity index 100% rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/reverb rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/reverb diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/scheduler-worker similarity index 100% rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/scheduler-worker diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/terminal-server b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/terminal-server similarity index 100% rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/terminal-server rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/terminal-server