diff --git a/Dockerfile b/Dockerfile index 1b8a27f5..c1b3b8c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN \ /build # 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 0cbbfcaa..09850b4a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -40,7 +40,7 @@ RUN \ /build # 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 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 3d8a17e5..6b57858b 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