Skip to content

Commit e757e5b

Browse files
committed
Check if plugin web is enabled before running
Fixes #141
1 parent c88cfe4 commit e757e5b

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ RUN \
8888
requests \
8989
requests_oauthlib \
9090
typing-extensions \
91-
unidecode && \
91+
unidecode \
92+
shyaml && \
9293
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
9394
echo "**** cleanup ****" && \
9495
apk del --purge \

Dockerfile.aarch64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ RUN \
8989
requests \
9090
requests_oauthlib \
9191
typing-extensions \
92-
unidecode && \
92+
unidecode \
93+
shyaml && \
9394
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
9495
echo "**** cleanup ****" && \
9596
apk del --purge \

package_versions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ serd-libs 0.32.2-r0 apk
256256
shaderc 2024.0-r2 apk
257257
shadow 4.16.0-r1 apk
258258
shared-mime-info 2.4-r2 apk
259+
shyaml 0.6.2 python
259260
six 1.17.0 python
260261
skalibs-libs 2.14.3.0-r0 apk
261262
sord-libs 0.16.16-r0 apk

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ init_diagram: |
8383
"beets:latest" <- Base Images
8484
# changelog
8585
changelogs:
86+
- {date: "30.12.25:", desc: "Check if plugin web is enabled before running"}
8687
- {date: "27.01.25:", desc: "Rebase to Alpine 3.21."}
8788
- {date: "01.10.24:", desc: "Add packages required for Discogs plugin."}
8889
- {date: "28.08.24:", desc: "Rebase to Alpine 3.20, switch from Pillow to Imagemagick."}
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4-
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
5-
exec \
6-
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \
7-
s6-setuidgid abc beet web
8-
else
9-
exec \
10-
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \
11-
beet web
4+
plugins=$(beet config --default | shyaml get-value plugins)
5+
6+
if [[ " $plugins " == *" web "* ]]; then
7+
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
8+
exec \
9+
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \
10+
s6-setuidgid abc beet web
11+
else
12+
exec \
13+
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8337" \
14+
beet web
15+
fi
1216
fi

0 commit comments

Comments
 (0)