diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 6e35beb..7f0e5f8 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_TRANSMISSION_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"transmission-daemon"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" diff --git a/Dockerfile b/Dockerfile index 535e277..2d76376 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE @@ -17,6 +17,7 @@ RUN \ gcc && \ echo "**** install packages ****" && \ apk add --no-cache \ + findutils \ openssl \ p7zip \ python3 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 48f5242..f7b60f7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE @@ -17,6 +17,7 @@ RUN \ gcc && \ echo "**** install packages ****" && \ apk add --no-cache \ + findutils \ openssl \ p7zip \ python3 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ef4dc60..0a1c9a2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 ARG UNRAR_VERSION=6.1.7 ARG BUILD_DATE @@ -17,6 +17,7 @@ RUN \ gcc && \ echo "**** install packages ****" && \ apk add --no-cache \ + findutils \ openssl \ p7zip \ python3 \ diff --git a/Jenkinsfile b/Jenkinsfile index 22aaa32..dac7641 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,8 +25,8 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/transmission' PR_DOCKERHUB_IMAGE = 'lspipepr/transmission' DIST_IMAGE = 'alpine' - DIST_TAG = '3.16' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/' + DIST_TAG = '3.17' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/community/' DIST_REPO_PACKAGES = 'transmission-daemon' MULTIARCH='true' CI='true' diff --git a/README.md b/README.md index 6e69164..37be375 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.01.23:** - Rebase to Alpine 3.17, restore GNU findutils package. * **02.11.22:** - Rebase to Alpine 3.16, migrate to s6v3. * **12.08.22:** - Bump unrar to 6.1.7. * **03.04.22:** - Add Transmissionic as a UI option. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 9c6d202..2632ca4 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,8 +15,8 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/transmission' - PR_DOCKERHUB_IMAGE = 'lspipepr/transmission' - DIST_IMAGE = 'alpine' - - DIST_TAG = '3.16' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/' + - DIST_TAG = '3.17' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/community/' - DIST_REPO_PACKAGES = 'transmission-daemon' - MULTIARCH='true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index f8559af..dbdb024 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.01.23:", desc: "Rebase to Alpine 3.17, restore GNU findutils package." } - { date: "02.11.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." } - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." } - { date: "03.04.22:", desc: "Add Transmissionic as a UI option." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-transmission-config/run b/root/etc/s6-overlay/s6-rc.d/init-transmission-config/run index 7c400b7..8a05b14 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-transmission-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-transmission-config/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # make folders mkdir -p \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-cron/run b/root/etc/s6-overlay/s6-rc.d/svc-cron/run index 2afc3b0..acfe0d8 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-cron/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-cron/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec \ /usr/sbin/crond -f -S -l 0 -c /etc/crontabs diff --git a/root/etc/s6-overlay/s6-rc.d/svc-transmission/run b/root/etc/s6-overlay/s6-rc.d/svc-transmission/run index 2be0fab..db8723e 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-transmission/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-transmission/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9091" \ s6-setuidgid abc /usr/bin/transmission-daemon \