From 25c8c52ea7af6c29dc5d89ff84c7ec7cba177b32 Mon Sep 17 00:00:00 2001 From: Alex McGrath Date: Sun, 13 Jul 2025 22:03:21 +0100 Subject: [PATCH] Use /usr/bin/s6-svscan if it exists --- pkg/build/types/image_configuration.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/build/types/image_configuration.go b/pkg/build/types/image_configuration.go index 80620bef7..aa2893072 100644 --- a/pkg/build/types/image_configuration.go +++ b/pkg/build/types/image_configuration.go @@ -230,6 +230,9 @@ func (ic *ImageConfiguration) Validate() error { // a service bundle. func (ic *ImageConfiguration) ValidateServiceBundle() error { ic.Entrypoint.Command = "/bin/s6-svscan /sv" + if _, err := os.Stat("/usr/bin/s6-svscan"); err == nil { + ic.Entrypoint.Command = "/usr/bin/s6-svscan /sv" + } // It's harmless to have a duplicate entry in /etc/apk/world, // apk will fix it up when the fixate op happens.