Upgrade s6-overlay from v2 to v3

.vscode/settings.json

@@ -7,5 +7,6 @@
     "[shellscript]": {
         "editor.defaultFormatter": "foxundermoon.shell-format",
         "editor.formatOnSave": true,
-    }
+    },
+    "docker.languageserver.formatter.ignoreMultilineInstructions": true
 }

Dockerfile

@@ -58,8 +58,14 @@ ENV AGENT_WORKDIR="${HOME}/agent" \
     ## Entrypoint related \
     # Fails if cont-init and fix-attrs fails \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
-    # Wait for dind before running CMD \
-    S6_CMD_WAIT_FOR_SERVICES=1
+    # Wait for services before running CMD \
+    S6_CMD_WAIT_FOR_SERVICES=1 \
+    # Give 15s for services to start \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=15000 \
+    # Give 15s for services to stop \
+    S6_SERVICES_GRACETIME=15000 \
+    # Honor container env on CMD \
+    S6_KEEP_ENV=1
 
 # create non-root user
 RUN group="${NON_ROOT_USER}"; \
@@ -248,10 +254,9 @@ RUN \
     # install helm 3 \
     ${CURL} https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | sudo -E bash -; \
     # install s6-overlay \
-    ${CURL} -o /tmp/s6-overlay-installer https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.1/s6-overlay-amd64-installer; \
-    chmod +x /tmp/s6-overlay-installer; \
-    sudo /tmp/s6-overlay-installer /; \
-    rm -f /tmp/s6-overlay-installer; \
+    version="3.1.6.2"; \
+    ${CURL} https://github.com/just-containers/s6-overlay/releases/download/v${version}/s6-overlay-noarch.tar.xz | sudo tar -C / -Jxpf -; \
+    ${CURL} https://github.com/just-containers/s6-overlay/releases/download/v${version}/s6-overlay-x86_64.tar.xz | sudo tar -C / -Jxpf -; \
     # fix sshd not starting \
     sudo mkdir -p /run/sshd; \
     # install fixuid \

init_as_root.sh

@@ -7,6 +7,8 @@
 
 set -eu
 
+# This can probably be improved:
+# https://github.com/just-containers/s6-overlay/issues/394#issuecomment-1690769622
 if [[ "${SSHD_ENABLED:-false}" == true ]]; then
     mv -f /etc/optional-services.d/sshd /etc/services.d/sshd
 fi

rootfs/etc/optional-services.d/sshd/check_readiness.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec ssh -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null [email protected] true &>/dev/null

rootfs/etc/optional-services.d/sshd/run

@@ -1,9 +1,6 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
+#!/bin/bash
 
 set -eu
 
 echo "[sshd] starting service" >&2
-exec s6-notifyoncheck -c \
-    "ssh -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null jenkins@localhost true" \
-    /usr/sbin/sshd -D -e
+exec s6-notifyoncheck -c /etc/services.d/sshd/check_readiness.sh /usr/sbin/sshd -D -e

rootfs/etc/services.d/dind/check_readiness.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec docker version &>/dev/null

rootfs/etc/services.d/dind/run

@@ -1,7 +1,6 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
+#!/bin/bash
 
 set -eu
 
 echo "[dind] starting service" >&2
-exec s6-notifyoncheck -c "docker version" dind dockerd
+exec s6-notifyoncheck -c /etc/services.d/dind/check_readiness.sh dind dockerd