From 25626f55f0df8c8a9149e427a4a56c25c5b097da Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Thu, 5 Jan 2023 07:20:14 +0100
Subject: [PATCH] Set UID/GID for users

---
 bootstrap.docker-compose.yml     |  1 +
 collectors.docker-compose.yml    | 18 ++++++++++++++++++
 downloads.docker-compose.yml     |  5 +++++
 media.docker-compose.yml         |  3 +++
 nas-compose.env                  |  3 +++
 notifications.docker-compose.yml |  1 +
 utilities.docker-compose.yml     |  6 ++++++
 7 files changed, 37 insertions(+)

diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml
index d670efd..16c4d62 100644
--- a/bootstrap.docker-compose.yml
+++ b/bootstrap.docker-compose.yml
@@ -53,6 +53,7 @@ services:
       --host tcp://docker:2375
       --hide-label nas-compose.boostrap=true
       --admin-password-file /run/secrets/portainer_password
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     networks:
       - docker
       - traefik
diff --git a/collectors.docker-compose.yml b/collectors.docker-compose.yml
index c416a41..76a138d 100644
--- a/collectors.docker-compose.yml
+++ b/collectors.docker-compose.yml
@@ -4,6 +4,9 @@ services:
   mylar:
     image: linuxserver/mylar3
     profiles: [ebooks]
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - gotify
@@ -20,6 +23,9 @@ services:
   lazylibrarian:
     image: linuxserver/lazylibrarian
     profiles: [ebooks]
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - gotify
@@ -35,6 +41,9 @@ services:
 
   sonarr:
     image: linuxserver/sonarr
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - gotify
@@ -50,6 +59,9 @@ services:
 
   radarr:
     image: linuxserver/radarr
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - gotify
@@ -65,6 +77,9 @@ services:
 
   bazarr:
     image: linuxserver/bazarr
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - gotify
@@ -78,6 +93,9 @@ services:
 
   ombi:
     image: linuxserver/ombi
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
       - downloads
diff --git a/downloads.docker-compose.yml b/downloads.docker-compose.yml
index 13d9c05..62fccb9 100644
--- a/downloads.docker-compose.yml
+++ b/downloads.docker-compose.yml
@@ -17,6 +17,9 @@ services:
 
   prowlarr:
     image: linuxserver/prowlarr
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - default
       - traefik
@@ -38,6 +41,8 @@ services:
   transmission:
     image: haugene/transmission-openvpn
     environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
       OPENVPN_PROVIDER: PIA
       OPENVPN_CONFIG: ${NASCOMPOSE_TRANSMISSION_VPNREGION?}
       OPENVPN_OPTS: --inactive 3600 --ping 10 --ping-exit 60
diff --git a/media.docker-compose.yml b/media.docker-compose.yml
index bd9a07f..a470096 100644
--- a/media.docker-compose.yml
+++ b/media.docker-compose.yml
@@ -11,6 +11,8 @@ services:
   plex:
     image: plexinc/pms-docker:plexpass
     environment:
+      PLEX_UID: ${NASCOMPOSE_UID?}
+      PLEX_GID: ${NASCOMPOSE_GID?}
       PLEX_CLAIM: ${NASCOMPOSE_PLEX_CLAIM}
     ports:
       - 32400:32400
@@ -31,6 +33,7 @@ services:
   plaxt:
     image: xanderstrike/goplaxt
     profiles: [plaxt]
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     environment:
       TRAKT_ID: '' #TODO Define properly
       TRAKT_SECRET: '' #TODO Define properly
diff --git a/nas-compose.env b/nas-compose.env
index 39cda01..6c69165 100644
--- a/nas-compose.env
+++ b/nas-compose.env
@@ -1,5 +1,8 @@
 COMPOSE_PROFILES=ebooks,plaxt,ombi
 
+NASCOMPOSE_UID=1000
+NASCOMPOSE_GID=1000
+
 NASCOMPOSE_SERVICES=
 NASCOMPOSE_DOWNLOADS=
 NASCOMPOSE_MEDIA=
diff --git a/notifications.docker-compose.yml b/notifications.docker-compose.yml
index cb277ed..6911854 100644
--- a/notifications.docker-compose.yml
+++ b/notifications.docker-compose.yml
@@ -6,6 +6,7 @@ services:
     entrypoint: ./data/entrypoint.sh
     environment:
       GOTIFY_DEFAULTUSER_PASS_FILE: /run/secrets/admin_password
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     networks:
       - gotify
       - traefik
diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml
index 5e8e009..e4f76ac 100644
--- a/utilities.docker-compose.yml
+++ b/utilities.docker-compose.yml
@@ -19,6 +19,9 @@ services:
 
   smokeping:
     image: linuxserver/smokeping
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
     volumes:
@@ -39,6 +42,9 @@ services:
 
   heimdall:
     image: linuxserver/heimdall
+    environment:
+      PUID: ${NASCOMPOSE_UID?}
+      PGID: ${NASCOMPOSE_GID?}
     networks:
       - traefik
     volumes: