From 80b943dee6517ff03d10f23c7321146c2011adf7 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 20 Dec 2024 16:46:09 +0000 Subject: [PATCH] Rebase to 3.21 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Jenkinsfile | 2 +- README.md | 6 ++++++ jenkins-vars.yml | 2 +- readme-vars.yml | 2 ++ .../s6-overlay/s6-rc.d/init-prowlarr-config/run | 9 +++++---- root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run | 15 +++++++++++---- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9efbf05..d7b24a8 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:3.21 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 038ed15..eeb7f39 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 # set version label ARG BUILD_DATE diff --git a/Jenkinsfile b/Jenkinsfile index 32a7706..b66dbbd 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { CI_WEB='true' CI_PORT='9696' CI_SSL='false' - CI_DELAY='120' + CI_DELAY='240' CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='/system/status' diff --git a/README.md b/README.md index 8197245..6cb9d2c 100755 --- a/README.md +++ b/README.md @@ -77,6 +77,10 @@ Setup info can be found [here](https://wikijs.servarr.com/prowlarr/quick-start-g This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). +## Non-Root Operation + +This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -129,6 +133,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-v /config` | Database and Prowlarr configs | | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | +| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). | ## Environment variables from files (Docker secrets) @@ -292,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.12.24:** - Rebase to Alpine 3.21. * **25.05.24:** - Rebase to Alpine 3.20. * **20.03.24:** - Rebase to Alpine 3.19. * **06.06.23:** - Rebase develop to Alpine 3.18. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 9ad030e..3b644b4 100755 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='9696' - CI_SSL='false' - - CI_DELAY='120' + - CI_DELAY='240' - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='/system/status' diff --git a/readme-vars.yml b/readme-vars.yml index a102324..8e8eb2c 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -25,6 +25,7 @@ param_usage_include_ports: true param_ports: - {external_port: "9696", internal_port: "9696", port_desc: "The port for the Prowlarr web UI"} readonly_supported: true +nonroot_supported: true # application setup block app_setup_block_enabled: true app_setup_block: | @@ -76,6 +77,7 @@ init_diagram: | "prowlarr:develop" <- Base Images # changelog changelogs: + - {date: "20.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "25.05.24:", desc: "Rebase to Alpine 3.20."} - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."} - {date: "06.06.23:", desc: "Rebase develop to Alpine 3.18."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-prowlarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-prowlarr-config/run index b8276e3..d5019c1 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-prowlarr-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-prowlarr-config/run @@ -3,7 +3,8 @@ mkdir -p /run/prowlarr-temp -# permissions -lsiown -R abc:abc \ - /config \ - /run/prowlarr-temp +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + lsiown -R abc:abc \ + /config \ + /run/prowlarr-temp +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run index d81f672..0f1fcf6 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run @@ -1,7 +1,14 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -exec \ - s6-notifyoncheck -d -n 300 -w 1000 \ - cd /app/prowlarr/bin s6-setuidgid abc /app/prowlarr/bin/Prowlarr \ - -nobrowser -data=/config +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + exec \ + s6-notifyoncheck -d -n 300 -w 1000 \ + cd /app/prowlarr/bin s6-setuidgid abc /app/prowlarr/bin/Prowlarr \ + -nobrowser -data=/config +else + exec \ + s6-notifyoncheck -d -n 300 -w 1000 \ + cd /app/prowlarr/bin /app/prowlarr/bin/Prowlarr \ + -nobrowser -data=/config +fi