3 Commits

Author SHA1 Message Date
f6d067b561 Fix s6-overlay format error (#29)
All checks were successful
Build Image / Validate Image (push) Successful in 2m29s
Build Image / Publish Image (push) Successful in 4m58s
Build Image / Notify (push) Successful in 3s
Build Tagged Release Image / Build Image (push) Successful in 4m46s
Build Tagged Release Image / Create Release (push) Successful in 19s
Build Tagged Release Image / Notify (push) Successful in 2s
Add missing shebangs that cause `S6 warning: unable to spawn ./finish: Exec format error` when `ONESHOT=true`. Fixes #28

Also brings the method for killing a container via service exit inline with s6's documented method

Reviewed-on: #29
2024-06-15 15:55:18 +00:00
2962b45496 Update dependency just-containers/s6-overlay to v3.2.0.0
All checks were successful
Test Pull Request / Build Image (pull_request) Successful in 4m23s
Test Pull Request / Notify (pull_request) Successful in 4s
Build Image / Validate Image (push) Successful in 1m40s
Build Image / Publish Image (push) Successful in 4m58s
Build Image / Notify (push) Successful in 3s
2024-06-07 15:00:12 +00:00
535a33506b Update certbot to v2.11.0
All checks were successful
Test Pull Request / Build Image (pull_request) Successful in 4m37s
Test Pull Request / Notify (pull_request) Successful in 3s
Build Image / Validate Image (push) Successful in 2m32s
Build Image / Publish Image (push) Successful in 4m53s
Build Image / Notify (push) Successful in 3s
2024-06-06 08:00:17 +00:00
4 changed files with 21 additions and 4 deletions

View File

@ -9,7 +9,7 @@ ENV S6_OVERLAY_ARCH=aarch64
FROM base-${TARGETARCH}${TARGETVARIANT} FROM base-${TARGETARCH}${TARGETVARIANT}
ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_VERSION="3.2.0.0"
# Core variables # Core variables
ENV PUID=1000 ENV PUID=1000

View File

@ -4,6 +4,7 @@
if [ $ONE_SHOT == "true" ]; then if [ $ONE_SHOT == "true" ]; then
# Cleanly kill container by sending kill signal to supervisor process # Cleanly kill container by sending kill signal to supervisor process
kill 1 echo 0 > /run/s6-linux-init-container-results/exitcode
/run/s6/basedir/bin/halt
fi fi

View File

@ -1 +1,9 @@
#!/command/with-contenv bash
# shellcheck shell=bash
if [ $ONE_SHOT == "false" ]; then
# Export exit code if not a ONE_SHOT
echo "$e" > /run/s6-linux-init-container-results/exitcode echo "$e" > /run/s6-linux-init-container-results/exitcode
fi

View File

@ -1 +1,9 @@
#!/command/with-contenv bash
# shellcheck shell=bash
if [ $ONE_SHOT == "false" ]; then
# Export exit code if not a ONE_SHOT
echo "$e" > /run/s6-linux-init-container-results/exitcode echo "$e" > /run/s6-linux-init-container-results/exitcode
fi