Merge pull request #38 from linuxserver/custom-files-x

Author: thespad

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

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

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