From 1a312c8ecae9d601c7c01713ca737c876a7c34c0 Mon Sep 17 00:00:00 2001 From: Luctia Date: Sun, 3 Jul 2022 20:15:11 +0200 Subject: [PATCH] Improved setup.sh --- docker-compose.yml | 40 ++++++++++++++++++++-------------------- setup.sh | 42 ++++++++++++------------------------------ 2 files changed, 32 insertions(+), 50 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 33f2083..b4edf00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,8 @@ services: container_name: plex network_mode: host environment: - - PUID=1000 - - PGID=${MEDIACENTER_GID} + - PUID=${UID} + - PGID=13000 - VERSION=docker - PLEX_CLAIM=${PLEX_CLAIM} volumes: @@ -21,8 +21,8 @@ services: depends_on: - plex environment: - - PUID=1000 - - PGID=${MEDIACENTER_GID} + - PUID=${UID} + - PGID=13000 - TZ=${TIMEZONE} volumes: - ${ROOT_DIR}/docker/tautulli-config:/config @@ -34,8 +34,8 @@ services: image: lscr.io/linuxserver/jellyfin:latest container_name: jellyfin environment: - - PUID=1000 - - PGID=${MEDIACENTER_GID} + - PUID=${UID} + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -52,8 +52,8 @@ services: image: lscr.io/linuxserver/radarr:latest container_name: radarr environment: - - PUID=${RADARR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13002 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -67,8 +67,8 @@ services: image: lscr.io/linuxserver/sonarr:latest container_name: sonarr environment: - - PUID=${SONARR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13001 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -82,8 +82,8 @@ services: image: lscr.io/linuxserver/lidarr:latest container_name: lidarr environment: - - PUID=${LIDARR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13003 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -97,8 +97,8 @@ services: image: lscr.io/linuxserver/readarr:develop container_name: readarr environment: - - PUID=${READARR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13004 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -112,8 +112,8 @@ services: image: lscr.io/linuxserver/mylar3:latest container_name: mylar3 environment: - - PUID=${MYLAR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13005 + - PGID=13000 - UMASK=002 volumes: - ${ROOT_DIR}/docker/mylar-config:/config @@ -126,8 +126,8 @@ services: image: lscr.io/linuxserver/prowlarr:develop container_name: prowlarr environment: - - PUID=${PROWLARR_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13006 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} volumes: @@ -140,8 +140,8 @@ services: image: lscr.io/linuxserver/qbittorrent:latest container_name: qbittorrent environment: - - PUID=${QBIT_UID} - - PGID=${MEDIACENTER_GID} + - PUID=13007 + - PGID=13000 - UMASK=002 - TZ=${TIMEZONE} - WEBUI_PORT=8080 diff --git a/setup.sh b/setup.sh index 1ec5d6e..9cc8ca7 100755 --- a/setup.sh +++ b/setup.sh @@ -1,14 +1,14 @@ #!/bin/bash # Make users and group -sudo useradd sonarr -sudo useradd radarr -sudo useradd lidarr -sudo useradd readarr -sudo useradd mylar -sudo useradd prowlarr -sudo useradd qbittorrent -sudo groupadd mediacenter +sudo useradd sonarr -u 13001 +sudo useradd radarr -u 13002 +sudo useradd lidarr -u 13003 +sudo useradd readarr -u 13004 +sudo useradd mylar -u 13005 +sudo useradd prowlarr -u 13006 +sudo useradd qbittorrent -u 13007 +sudo groupadd mediacenter -g 13000 sudo usermod -a -G mediacenter sonarr sudo usermod -a -G mediacenter radarr sudo usermod -a -G mediacenter lidarr @@ -18,14 +18,12 @@ sudo usermod -a -G mediacenter prowlarr sudo usermod -a -G mediacenter qbittorrent # Make directories -sudo mkdir docker data -sudo mkdir docker/sonarr-config docker/radarr-config docker/lidarr-config docker/readarr-config docker/mylar-config docker/prowlarr-config docker/qbittorrent-config -sudo mkdir data/torrents data/media -sudo mkdir data/torrents/tv data/torrents/movies data/torrents/music data/torrents/books data/torrents/comics data/media/tv data/media/movies data/media/music data/media/books data/media/comics +sudo mkdir -pv docker/{sonarr,radarr,lidarr,readarr,mylar,prowlarr,qbittorrent}-config +sudo mkdir -pv data/{torrents,media}/{tv,movies,music,books,comics} # Set permissions sudo chmod -R 775 data/ -sudo chown -R 1000:mediacenter data/ +sudo chown -R $(id -u):mediacenter data/ sudo chown -R sonarr:mediacenter docker/sonarr-config sudo chown -R radarr:mediacenter docker/radarr-config sudo chown -R lidarr:mediacenter docker/lidarr-config @@ -34,20 +32,4 @@ sudo chown -R mylar:mediacenter docker/mylar-config sudo chown -R prowlarr:mediacenter docker/prowlarr-config sudo chown -R qbittorrent:mediacenter docker/qbittorrent-config -sonarr_id=$(sudo cat /etc/passwd | grep sonarr | cut -c 10-13) -radarr_id=$(sudo cat /etc/passwd | grep radarr | cut -c 10-13) -lidarr_id=$(sudo cat /etc/passwd | grep lidarr | cut -c 10-13) -readarr_id=$(sudo cat /etc/passwd | grep readarr | cut -c 11-14) -mylar_id=$(sudo cat /etc/passwd | grep mylar | cut -c 9-12) -prowlarr_id=$(sudo cat /etc/passwd | grep prowlarr | cut -c 12-15) -qbit_id=$(sudo cat /etc/passwd | grep qbittorrent | cut -c 15-18) -group_id=$(sudo cat /etc/group | grep mediacenter | cut -c 15-18) - -echo "SONARR_UID=${sonarr_id}" >> .env -echo "RADARR_UID=${radarr_id}" >> .env -echo "LIDARR_UID=${lidarr_id}" >> .env -echo "READARR_UID=${readarr_id}" >> .env -echo "MYLAR_UID=${mylar_id}" >> .env -echo "PROWLARR_UID=${prowlarr_id}" >> .env -echo "QBIT_UID=${qbit_id}" >> .env -echo "MEDIACENTER_GID=${group_id}" >> .env +echo "UID=$(id -u)" >> .env