adds user group ids

2024-11-15 23:37:46 +01:00 · 2024-11-15 23:37:46 +01:00 · 9bd4259cf2
commit 9bd4259cf2
parent 39a62a239d
15 changed files with 85 additions and 40 deletions
--- a/config/nixos/docker/arr-stack/docker-compose.yml
+++ b/config/nixos/docker/arr-stack/docker-compose.yml
@ -4,6 +4,8 @@ services:
    container_name: radarr
    image: lscr.io/linuxserver/radarr:latest
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    ports:
      - 7878:7878
@ -18,6 +20,8 @@ services:
    image: linuxserver/sonarr:latest
    container_name: sonarr
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    volumes:
      - ./data/sonarr-config:/config
@ -31,6 +35,8 @@ services:
  lidarr:
    image: linuxserver/lidarr:latest
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    ports:
      - 8686:8686
@ -44,6 +50,8 @@ services:
  whisparr:
    image: ghcr.io/hotio/whisparr:latest
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    ports:
      - 8386:8686
@ -58,6 +66,8 @@ services:
    container_name: prowlarr
    image: linuxserver/prowlarr:latest
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    volumes:
      - ./data/prowlarr-config:/config
@ -71,6 +81,8 @@ services:
    image: ghcr.io/flaresolverr/flaresolverr:latest
    container_name: flaresolverr
    environment:
+      - PUID=1000
+      - PGID=1000
      - LOG_LEVEL=${LOG_LEVEL:-info}
      - LOG_HTML=${LOG_HTML:-false}
      - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none}
--- a/config/nixos/docker/default.nix
+++ b/config/nixos/docker/default.nix
@ -8,6 +8,7 @@
    ./sabnzbd.nix
    ./gitea.nix
    ./golink.nix
+    ./plex.nix
  ];
 }
 # TODO: Import all the package modules, disabled for testing one by one.
--- a/config/nixos/docker/duplicati/docker-compose.yml
+++ b/config/nixos/docker/duplicati/docker-compose.yml
@ -3,8 +3,8 @@ services:
  app:
    image: lscr.io/linuxserver/duplicati:latest
    environment:
-      - PUID=1000
-      - PGID=1000
+      - PUID=1
+      - PGID=1
      - TZ=Europe/Amsterdam
      - CLI_ARGS=
    volumes:
--- a/config/nixos/docker/factorio/docker-compose.yml
+++ b/config/nixos/docker/factorio/docker-compose.yml
@ -16,6 +16,8 @@ services:
    container_name: "factorio-server-manager"
    restart: "unless-stopped"
    environment:
+      - PUID=1000
+      - PGID=1000
      - "FACTORIO_VERSION=stable"
      - "RCON_PASS=458fc84534"
    ports:
--- a/config/nixos/docker/gitea/docker-compose.yml
+++ b/config/nixos/docker/gitea/docker-compose.yml
@ -15,6 +15,9 @@ services:
  server:
    image: gitea/gitea:latest
    restart: always
+    environment:
+      - PUID=1000
+      - PGID=1000
    volumes:
      - /mnt/services/gitea/gitea:/data
      - /etc/timezone:/etc/timezone:ro
@ -29,6 +32,8 @@ services:
    image: postgres:15-alpine
    restart: always
    environment:
+      - PUID=1000
+      - PGID=1000
      - POSTGRES_USER=gitea
      - POSTGRES_PASSWORD=gitea
      - POSTGRES_DB=gitea
@ -43,10 +48,12 @@ services:
      - ./act-runner-config.yaml:/config.yaml
      - /var/run/docker.sock:/var/run/docker.sock
    environment:
-        - GITEA_INSTANCE_URL=https://git.mvl.sh
-        - GITEA_RUNNER_REGISTRATION_TOKEN=lIlte9POlu7aBanhCh3Xm1SPfohrexyfxqs9Yiqz
-        - GITEA_RUNNER_NAME=act-worker
-        - CONFIG_FILE=/config.yaml
+      - PUID=1000
+      - PGID=1000
+      - GITEA_INSTANCE_URL=https://git.mvl.sh
+      - GITEA_RUNNER_REGISTRATION_TOKEN=lIlte9POlu7aBanhCh3Xm1SPfohrexyfxqs9Yiqz
+      - GITEA_RUNNER_NAME=act-worker
+      - CONFIG_FILE=/config.yaml
    restart: always
    networks:
      - net
--- a/config/nixos/docker/golink/docker-compose.yml
+++ b/config/nixos/docker/golink/docker-compose.yml
@ -3,6 +3,8 @@ services:
  server:
    image: ghcr.io/tailscale/golink:main
    environment:
+      - PUID=1000
+      - PGID=1000
      - TS_AUTHKEY=${TS_AUTHKEY}
    volumes:
      - /mnt/services/golink:/home/nonroot
--- a/config/nixos/docker/immich/docker-compose.yml
+++ b/config/nixos/docker/immich/docker-compose.yml
@ -15,6 +15,9 @@ services:
    depends_on:
      - redis
      - database
+    environment:
+      - PUID=1000
+      - PGID=1000
    restart: always
    healthcheck:
      disable: false
@ -45,6 +48,8 @@ services:
    container_name: immich_postgres
    image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
    environment:
+      PUID: 1000
+      PGID: 1000
      POSTGRES_PASSWORD: ${DB_PASSWORD}
      POSTGRES_USER: ${DB_USERNAME}
      POSTGRES_DB: ${DB_DATABASE_NAME}
--- a/config/nixos/docker/minecraft/docker-compose.yml
+++ b/config/nixos/docker/minecraft/docker-compose.yml
@ -25,6 +25,8 @@ services:
      - "19132:19132/udp"
      - "3456:8100/tcp"
    environment:
+      PUID: 1000
+      PGID: 1000
      EULA: "TRUE"
      TYPE: "paper"
      VERSION: 1.21.1
--- a/config/nixos/docker/plex/docker-compose.yml
+++ b/config/nixos/docker/plex/docker-compose.yml
@ -12,12 +12,14 @@ services:
              capabilities: [gpu]

    environment:
+      - PUID=1000
+      - PGID=1000
      - VERSION=docker
      - PLEX_CLAIM=claim-sfTz4AWc_Uxhzfzz9fKS
      - NVIDIA_VISIBLE_DEVICES=all
      - NVIDIA_DRIVER_CAPABILITIES=compute,video,utility
    volumes:
-      - ./data/plex:/config
+      - /mnt/services/plex/plex:/config
      - /mnt/movies:/movies
      - /mnt/tvshows:/tvshows
      - /mnt/music:/music
@ -27,9 +29,11 @@ services:
    image: lscr.io/linuxserver/tautulli:latest
    container_name: tautulli
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    volumes:
-      - ./data/tautulli:/config
+      - /mnt/services/plex/tautulli:/config
    ports:
      - 8181:8181
    restart: unless-stopped
--- a/config/nixos/docker/sabnzbd/docker-compose.yml
+++ b/config/nixos/docker/sabnzbd/docker-compose.yml
@ -1,8 +1,10 @@
 services:
- sabnzbd:
+  sabnzbd:
    image: lscr.io/linuxserver/sabnzbd:latest
    container_name: sabnzbd
    environment:
+      - PUID=1000
+      - PGID=1000
      - TZ=Europe/Amsterdam
    volumes:
      - /mnt/services/sabnzbd:/config
--- a/config/nixos/docker/satisfactory/docker-compose.yml
+++ b/config/nixos/docker/satisfactory/docker-compose.yml
@ -31,6 +31,8 @@ services:
      - './data/certs/live/satisfactory.mvl.sh/fullchain.pem:/config/gamefiles/FactoryGame/Certificates/cert_chain.pem'
      - './data/certs/live/satisfactory.mvl.sh/privkey.pem:/config/gamefiles/FactoryGame/Certificates/private_key.pem'
    environment:
+      - PUID=1000
+      - PGID=1000
      - MAXPLAYERS=4
      - ROOTLESS=false
      - STEAMBETA=false
--- a/config/nixos/docker/stash/docker-compose.yml
+++ b/config/nixos/docker/stash/docker-compose.yml
@ -6,6 +6,8 @@ services:
    ports:
      - "9999:9999"
    environment:
+      - PUID=1000
+      - PGID=1000
      - STASH_STASH=/data/
      - STASH_GENERATED=/generated/
      - STASH_METADATA=/metadata/
--- a/config/nixos/docker/torrent/README.md
+++ b/config/nixos/docker/torrent/README.md
--- a/config/nixos/docker/torrent/docker-compose.yml
+++ b/config/nixos/docker/torrent/docker-compose.yml
@ -1,35 +1,37 @@
 services:
  gluetun:
-      image: qmcgaw/gluetun:latest
-      container_name: gluetun
-      cap_add:
-        - NET_ADMIN
-      network_mode: bridge
-      ports:
-        - 6881:6881
-        - 6881:6881/udp
-        - 8085:8085
-      volumes:
-        - /mnt/services/torrent/gluetun:/gluetun
-      environment:
-        - VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER}
-        - OPENVPN_USER=${OPENVPN_USER}
-        - OPENVPN_PASSWORD=${OPENVPN_PASSWORD}
-        - SERVER_COUNTRIES=${SERVER_COUNTRIES}
-      restart: always
+    image: qmcgaw/gluetun:latest
+    container_name: gluetun
+    cap_add:
+      - NET_ADMIN
+    network_mode: bridge
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - 8085:8085
+    volumes:
+      - /mnt/services/torrent/gluetun:/gluetun
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - VPN_SERVICE_PROVIDER=${VPN_SERVICE_PROVIDER}
+      - OPENVPN_USER=${OPENVPN_USER}
+      - OPENVPN_PASSWORD=${OPENVPN_PASSWORD}
+      - SERVER_COUNTRIES=${SERVER_COUNTRIES}
+    restart: always

  qbittorrent:
-      image: lscr.io/linuxserver/qbittorrent
-      container_name: qbittorrent
-      network_mode: "service:gluetun"
-      environment:
-        - PUID=1000
-        - PGID=1000
-        - WEBUI_PORT=8085
-      volumes:
-        - "/etc/localtime:/etc/localtime:ro"
-        - /mnt/services/torrent/qbit-config:/config
-        - /mnt:/storage
-      depends_on:
-        - gluetun
-      restart: always
+    image: lscr.io/linuxserver/qbittorrent
+    container_name: qbittorrent
+    network_mode: "service:gluetun"
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - WEBUI_PORT=8085
+    volumes:
+      - "/etc/localtime:/etc/localtime:ro"
+      - /mnt/services/torrent/qbit-config:/config
+      - /mnt:/storage
+    depends_on:
+      - gluetun
+    restart: always
--- a/config/nixos/docker/wireguard/docker-compose.yml
+++ b/config/nixos/docker/wireguard/docker-compose.yml
@ -17,6 +17,8 @@ services:
    cap_add:
      - NET_ADMIN
    environment:
+      - PUID=1000
+      - PGID=1000
      - PEERS=s24,pc,laptop
    volumes:
      - /mnt/services/wireguard/data:/config