From d4107b16285c3ada85b5398f0e8a6d3d3f121317 Mon Sep 17 00:00:00 2001
From: Jean Froment <jean.froment@apalia.net>
Date: Sun, 3 Mar 2019 14:00:07 +0100
Subject: [PATCH] Adapt to custom PGID and PUID

---
 .env.sample        |  2 ++
 docker-compose.yml | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.env.sample b/.env.sample
index 6425c41..d4c2aa3 100644
--- a/.env.sample
+++ b/.env.sample
@@ -3,6 +3,8 @@ ACME_MAIL=my-email@my-provider.com
 HTTP_USER=myuser
 HTTP_PASSWORD=mypassword_encoded
 PORTAINER_ADMIN_PASSWORD=h4ckMePleAse
+PGID=1000
+PUID=1000
 
 # Filerun
 MYSQL_ROOT_PASSWORD=your_mysql_root_password
diff --git a/docker-compose.yml b/docker-compose.yml
index 5f2bb38..923c4df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,8 +27,8 @@ services:
             - configdeluge:/config
             - downloads:/downloads
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=deluge'
@@ -105,8 +105,8 @@ services:
     #         - config:/config
     #         - torrents:/torrents
     #     environment:
-    #         - PGID=0
-    #         - PUID=0
+    #         - PGID=${PGID}
+    #         - PUID=${PUID}
     #         - TZ=Europe/Paris
     #         - VERSION=latest
     #     labels:
@@ -126,8 +126,8 @@ services:
             - torrents:/downloads
             - /etc/localtime:/etc/localtime:ro
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=jackett'
@@ -146,8 +146,8 @@ services:
             - torrents:/torrents
             - /etc/localtime:/etc/localtime:ro
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=sonarr'
@@ -167,8 +167,8 @@ services:
             - torrents:/torrents
             - /etc/localtime:/etc/localtime:ro
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=radarr'
@@ -185,8 +185,8 @@ services:
         volumes:
             - torrents:/torrents
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=bazarr'
@@ -204,8 +204,8 @@ services:
             - configtautulli:/config
             - config:/logs:ro # Inside of tautulli, bind to logs via "/logs/Plex Media Server/Logs"
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.tautulli.backend=tautulli'
@@ -221,8 +221,8 @@ services:
             - configjdownloader:/config
             - downloads:/output
         environment:
-            - USER_ID=0
-            - GROUP_ID=0
+            - USER_ID=${PUID}
+            - GROUP_ID=${PGID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=jdownloader'
@@ -240,8 +240,8 @@ services:
             - confignextcloud:/config
             - alldata:/data
         environment:
-            - PGID=0
-            - PUID=0
+            - PGID=${PGID}
+            - PUID=${PUID}
             - TZ=Europe/Paris
         labels:
             - 'traefik.backend=nextcloud'