Skip to content

Commit 43187e0

Browse files
committed
Rebase to 3.21, support non-root operation
1 parent 4977eff commit 43187e0

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
44

55
# set version label
66
ARG BUILD_DATE

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
44

55
# set version label
66
ARG BUILD_DATE

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/d
8787

8888
This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
8989

90+
## Non-Root Operation
91+
92+
This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
93+
9094
## Usage
9195

9296
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -145,6 +149,7 @@ Containers are configured using parameters passed at runtime (such as those abov
145149
| `-v /music` | Music files (See note in Application setup). |
146150
| `-v /downloads` | Path to your download folder for music (See note in Application setup). |
147151
| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
152+
| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
148153

149154
## Environment variables from files (Docker secrets)
150155

@@ -308,6 +313,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
308313

309314
## Versions
310315

316+
* **12.12.24:** - Rebase to Alpine 3.21.
311317
* **25.05.24:** - Rebase to Alpine 3.20.
312318
* **20.03.24:** - Rebase to Alpine 3.19.
313319
* **06.06.23:** - Rebase nightly to Alpine 3.18.

readme-vars.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ param_usage_include_ports: true
3030
param_ports:
3131
- {external_port: "8686", internal_port: "8686", port_desc: "Application WebUI"}
3232
readonly_supported: true
33+
nonroot_supported: true
3334
# application setup block
3435
app_setup_block_enabled: true
3536
app_setup_block: |
@@ -91,6 +92,7 @@ init_diagram: |
9192
"lidarr:nightly" <- Base Images
9293
# changelog
9394
changelogs:
95+
- {date: "12.12.24:", desc: "Rebase to Alpine 3.21."}
9496
- {date: "25.05.24:", desc: "Rebase to Alpine 3.20."}
9597
- {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
9698
- {date: "06.06.23:", desc: "Rebase nightly to Alpine 3.18."}

root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
mkdir -p /run/lidarr-temp
55

6-
# permissions
7-
lsiown -R abc:abc \
8-
/config \
9-
/run/lidarr-temp
6+
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
7+
lsiown -R abc:abc \
8+
/config \
9+
/run/lidarr-temp
10+
fi
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4+
if [[ -n ${LSIO_NON_ROOT_USER} ]]; then
5+
exec \
6+
s6-notifyoncheck -d -n 300 -w 1000 \
7+
cd /app/lidarr/bin /app/lidarr/bin/Lidarr \
8+
-nobrowser -data=/config
9+
else
410
exec \
511
s6-notifyoncheck -d -n 300 -w 1000 \
612
cd /app/lidarr/bin s6-setuidgid abc /app/lidarr/bin/Lidarr \
713
-nobrowser -data=/config
14+
fi

0 commit comments

Comments
 (0)