Skip to content

Commit 711ecdc

Browse files
authored
Merge pull request #41 from linuxserver/main-3.21
2 parents 9008f17 + 5079aa6 commit 711ecdc

File tree

6 files changed

+24
-9
lines changed

6 files changed

+24
-9
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
@@ -74,6 +74,10 @@ Access the webui at `<your-ip>:5055`, for more information check out [Overseerr]
7474

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

77+
## Non-Root Operation
78+
79+
This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
80+
7781
## Usage
7882

7983
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -126,6 +130,7 @@ Containers are configured using parameters passed at runtime (such as those abov
126130
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
127131
| `-v /config` | Persistent config files |
128132
| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
133+
| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
129134

130135
## Environment variables from files (Docker secrets)
131136

@@ -289,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
289294

290295
## Versions
291296

297+
* **24.12.24:** - Rebase to Alpine 3.21.
292298
* **31.05.24:** - Rebase to Alpine 3.20.
293299
* **23.12.23:** - Rebase to Alpine 3.19.
294300
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.

readme-vars.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ param_usage_include_vols: true
2626
param_volumes:
2727
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
2828
readonly_supported: true
29+
nonroot_supported: true
2930
# application setup block
3031
app_setup_block_enabled: true
3132
app_setup_block: |
@@ -75,6 +76,7 @@ init_diagram: |
7576
"overseerr:latest" <- Base Images
7677
# changelog
7778
changelogs:
79+
- {date: "24.12.24:", desc: "Rebase to Alpine 3.21."}
7880
- {date: "31.05.24:", desc: "Rebase to Alpine 3.20."}
7981
- {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
8082
- {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}

root/etc/s6-overlay/s6-rc.d/init-overseerr-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/overseerr-temp
55

6-
# permissions
7-
lsiown -R abc:abc \
8-
/config \
9-
/run/overseerr-temp
6+
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
7+
lsiown -R abc:abc \
8+
/config \
9+
/run/overseerr-temp
10+
fi

root/etc/s6-overlay/s6-rc.d/svc-overseerr/run

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
export CONFIG_DIRECTORY="/config"
55

6-
exec \
7-
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5055" \
8-
cd /app/overseerr s6-setuidgid abc /usr/bin/yarn start
6+
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
7+
exec \
8+
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5055" \
9+
cd /app/overseerr s6-setuidgid abc /usr/bin/yarn start
10+
else
11+
exec \
12+
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 5055" \
13+
cd /app/overseerr /usr/bin/yarn start
14+
fi

0 commit comments

Comments
 (0)