Merge pull request #25 from dash14/refactor/s6-readiness-notification

Replace Docker healthcheck with s6 readiness notifications

Author: dash14

.github/workflows/test.yml

@@ -90,6 +90,8 @@ jobs:
         run: node report/main.mjs ./compose.yml || true
 
       - name: Run assertions
+        env:
+          BUILDER_NAME: ${{ matrix.builder_name }}
         run: ${{ matrix.assert_script }}
 
       - name: Cleanup

compose.yml

@@ -33,9 +33,3 @@ services:
       - ALLOWED_IP_RULES=${ALLOWED_IP_RULES:-}
       - EXTERNAL_RESOLVER=${EXTERNAL_RESOLVER:-1.1.1.1,8.8.8.8}
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "sh", "-c", "curl -sf --unix-socket /var/run/haproxy-health.sock http://localhost/health"]
-      interval: 30s
-      timeout: 5s
-      retries: 10
-      start_period: 5s

docker/Dockerfile

@@ -1,8 +1,6 @@
 ARG BUILDKIT_VERSION=v0.28.0
 ARG CNI_VERSION=v1.9.0
 ARG ALPINE_RELEASE=3.23
-ARG S6_OVERLAY_VERSION=v3.2.2.0
-
 # Prepare dependencies
 FROM alpine:$ALPINE_RELEASE AS deps
 ARG CNI_VERSION
@@ -21,22 +19,13 @@ LABEL org.opencontainers.image.title="buildcage" \
       org.opencontainers.image.source="https://github.com/dash14/buildcage"
 
 RUN apk add --no-cache \
+      s6-overlay \
       haproxy \
       dnsmasq \
       iptables \
       curl \
       quickjs
 
-# s6-overlay
-ARG S6_OVERLAY_VERSION
-RUN apk add --no-cache xz && \
-    S6_ARCH=$(uname -m) && \
-    curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" \
-      | xz -d | tar -C / -xpf - && \
-    curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" \
-      | xz -d | tar -C / -xpf - && \
-    apk del xz
-
 ENV S6_KEEP_ENV=1
 ENV S6_LOGGING=0
 
@@ -68,10 +57,5 @@ COPY files/THIRD_PARTY_LICENSES /opt/buildcage/THIRD_PARTY_LICENSES
 # s6 service definitions and init scripts
 COPY files/s6-rc.d/ /etc/s6-overlay/s6-rc.d/
 COPY files/s6-scripts/ /etc/s6-overlay/scripts/
-RUN chmod +x /etc/s6-overlay/scripts/* && \
-    chmod +x /etc/s6-overlay/s6-rc.d/dnsmasq/run && \
-    chmod +x /etc/s6-overlay/s6-rc.d/haproxy/run && \
-    chmod +x /etc/s6-overlay/s6-rc.d/haproxy-log/run
 
 ENTRYPOINT ["/init"]
-CMD ["buildkitd", "--oci-worker-net=cni"]

docker/files/s6-rc.d/buildkitd/dependencies.d/dnsmasq

@@ -0,0 +1,2 @@
+#!/command/with-contenv sh
+exec buildkitd --oci-worker-net=cni

docker/files/s6-rc.d/buildkitd/dependencies.d/haproxy

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

docker/files/s6-rc.d/buildkitd/dependencies.d/init-iptables

@@ -0,0 +1,2 @@
+#!/bin/sh
+nslookup localhost 127.0.0.1 > /dev/null 2>&1

docker/files/s6-rc.d/buildkitd/run

@@ -0,0 +1 @@
+3