From 5e0f758f3c95a32c660860c9730ec26133645460 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 20 Dec 2024 16:47: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 ++ .../etc/s6-overlay/s6-rc.d/init-radarr-config/run | 9 +++++---- root/etc/s6-overlay/s6-rc.d/svc-radarr/run | 15 +++++++++++---- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 654dcff..8697ef9 100644 --- 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 c3bb86f..c9411e6 100644 --- 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 d1f3082..23f05b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { CI_WEB='true' CI_PORT='7878' 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 69d0edc..d43438a 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,10 @@ The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/d 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. @@ -141,6 +145,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-v /movies` | Location of Movie library on disk (See note in Application setup) | | `-v /downloads` | Location of download managers output directory (See note in Application setup) | | `--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) @@ -304,6 +309,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 8bda9aa..145b42d 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='7878' - 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 cb26e43..c66e4c1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -30,6 +30,7 @@ param_usage_include_ports: true param_ports: - {external_port: "7878", internal_port: "7878", port_desc: "The port for the Radarr web UI"} readonly_supported: true +nonroot_supported: true # application setup block app_setup_block_enabled: true app_setup_block: | @@ -87,6 +88,7 @@ init_diagram: | "radarr: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-radarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run index 00ce068..1404674 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run @@ -3,7 +3,8 @@ mkdir -p /run/radarr-temp -# permissions -lsiown -R abc:abc \ - /config \ - /run/radarr-temp +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + lsiown -R abc:abc \ + /config \ + /run/radarr-temp +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run index 9737861..e7814bc 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run @@ -1,7 +1,14 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -exec \ - s6-notifyoncheck -d -n 300 -w 1000 \ - cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \ - -nobrowser -data=/config +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + exec \ + s6-notifyoncheck -d -n 300 -w 1000 \ + cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \ + -nobrowser -data=/config +else + exec \ + s6-notifyoncheck -d -n 300 -w 1000 \ + cd /app/radarr/bin /app/radarr/bin/Radarr \ + -nobrowser -data=/config +fi