Bladeren bron

Fix permissions

Spencer Gardner 1 week geleden
bovenliggende
commit
7200779bf9
2 gewijzigde bestanden met toevoegingen van 11 en 1 verwijderingen
  1. 3 1
      Dockerfile
  2. 8 0
      deluged_init.sh

+ 3 - 1
Dockerfile

@@ -36,7 +36,9 @@ RUN apt-get update && \
 
 COPY --from=webapi-build /src/dist/WebAPI-*.egg /config/plugins/
 
-RUN useradd -ms /bin/bash deluge && \
+# Ubuntu 24.04 ships an ubuntu user on 1000; give that ID to deluge instead
+RUN userdel -r ubuntu && \
+    useradd -ms /bin/bash -u 1000 -U deluge && \
     chown -R deluge:deluge /config
 
 COPY deluged_init.sh pia_port_forward.sh /sbin/

+ 8 - 0
deluged_init.sh

@@ -2,6 +2,14 @@
 
 /sbin/openvpn_init.sh &
 
+# Match the owner of the mounted volumes (PUID/PGID), default 1000:1000
+PUID="${PUID:-1000}"
+PGID="${PGID:-1000}"
+if [ "$(id -u deluge)" != "$PUID" ] || [ "$(id -g deluge)" != "$PGID" ]; then
+    groupmod -o -g "$PGID" deluge
+    usermod -o -u "$PUID" -g "$PGID" deluge
+fi
+
 # /config is usually a mounted volume; make sure the deluge user can write to it
 chown -R deluge:deluge /config