diff --git a/Dockerfile b/Dockerfile index e58106c..5ee5eda 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 # environment ENV ARCH=x86_64 @@ -27,7 +27,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # 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 16f3acb..4eba5de 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 # environment ENV ARCH=aarch64 @@ -27,7 +27,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # 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/Jenkinsfile b/Jenkinsfile index d81b2c0..5d3d92a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -965,7 +965,7 @@ pipeline { "name": $tag_name, "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes), "draft": false, - "prerelease": false }' > releasebody.json.done + "prerelease": true }' > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done ''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 239b4a0..ec388e9 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,7 +4,7 @@ project_name: docker-baseimage-fedora external_type: na custom_version_command: "echo 42" -release_type: stable +release_type: prerelease release_tag: "42" ls_branch: master repo_vars: 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