From 123d73772fd610ccb37056a86d9fd0828df78ab9 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 11 Nov 2025 20:56:40 +0000 Subject: [PATCH 1/2] Check custom files are executable before running --- root/etc/s6-overlay/s6-rc.d/init-custom-files/run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/run b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run index 3d8a17e..6b57858 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-custom-files/run +++ b/root/etc/s6-overlay/s6-rc.d/init-custom-files/run @@ -9,12 +9,12 @@ if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)" echo "[custom-init] Files found, executing" for SCRIPT in "${SCRIPTS_DIR}"/*; do NAME="$(basename "${SCRIPT}")" - if [[ -f "${SCRIPT}" ]]; then + if [[ -x "${SCRIPT}" ]]; then echo "[custom-init] ${NAME}: executing..." /bin/bash "${SCRIPT}" echo "[custom-init] ${NAME}: exited $?" - elif [[ ! -f "${SCRIPT}" ]]; then - echo "[custom-init] ${NAME}: is not a file" + elif [[ ! -x "${SCRIPT}" ]]; then + echo "[custom-init] ${NAME}: is not an executable file" fi done else From 892694d503546be532a283edb6d28f725b2d48a1 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 11 Nov 2025 21:19:43 +0000 Subject: [PATCH 2/2] Bump s6 --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9e836f..61de12d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM alpine:3 as rootfs-stage +FROM alpine:3 AS rootfs-stage ARG ARCH_VERSION @@ -34,7 +34,7 @@ RUN \ /root-out # pacstrap stage -FROM scratch as pacstrap-stage +FROM scratch AS pacstrap-stage COPY --from=rootfs-stage /root-out/ / RUN \ @@ -72,7 +72,7 @@ RUN \ rm /root-out/var/lib/pacman/sync/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.0.2" +ARG S6_OVERLAY_VERSION="3.2.1.0" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e3cac48..cac01e3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM alpine:3 as rootfs-stage +FROM alpine:3 AS rootfs-stage # install packages RUN \ @@ -23,7 +23,7 @@ RUN \ /root-out # pacstrap stage -FROM scratch as pacstrap-stage +FROM scratch AS pacstrap-stage COPY --from=rootfs-stage /root-out/ / RUN \ @@ -64,7 +64,7 @@ RUN \ rm /root-out/var/lib/pacman/sync/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.0.2" +ARG S6_OVERLAY_VERSION="3.2.1.0" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay