From 51a9de57e6e2c9f4d6a22b4214b67c0827930c94 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 5 Dec 2022 05:56:49 -0500 Subject: [PATCH 01/10] io specific docker-compose with full starr stack --- media/docker-compose.yml | 67 +++++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 918dce9..a740453 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -12,10 +12,9 @@ services: - 8888:8888/tcp # HTTP proxy - 8388:8388/tcp # Shadowsocks - 8388:8388/udp # Shadowsocks - # - 8080:8080/tcp # sabnzbd webUI - - 8085:8085/tcp # sabnzbd webUI + - 8080:8080/tcp # sabnzbd webUI volumes: - - /vpn-gluetun:/gluetun + - gluetun_data:/gluetun environment: # See https://github.com/qdm12/gluetun/wiki - VPN_SERVICE_PROVIDER=protonvpn @@ -36,9 +35,63 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - /mnt/d/docker/sabnzbd/config:/config - - /mnt/d/media/downloads/sabnzbd/complete:/downloads - - /mnt/d/media/downloads/sabnzbd/incomplete:/incomplete-downloads + - sabnzbd_data/config:/config + - starr_download/complete:/downloads + - starr_download/incomplete:/incomplete-downloads # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above network_mode: "service:gluetun" - restart: always \ No newline at end of file + restart: always + sonarr: + image: lscr.io/linuxserver/sonarr:latest + container_name: sonarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/New_York + volumes: + - starr_data/sonarr/config:/config + - /mnt/share/media/tv:/tv #optional + - starr_download/complete:/downloads #optional + ports: + - 8989:8989 + restart: always + radarr: + image: lscr.io/linuxserver/radarr:latest + container_name: radarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/New_York + volumes: + - starr_data/radarr/config:/config + - /mnt/share/media/movies:/movies #optional + - starr_download/complete:/downloads #optional + ports: + - 7878:7878 + restart: always + lidarr: + image: lscr.io/linuxserver/lidarr:latest + container_name: lidarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/New_York + volumes: + - starr_data/lidarr/config:/config + - /mnt/share/media/music:/music #optional + - starr_download/complete:/downloads #optional + ports: + - 8686:8686 + restart: always + prowlarr: + image: lscr.io/linuxserver/prowlarr:develop + container_name: prowlarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/New_York + volumes: + - starr_data/prowlarr/config:/config + ports: + - 9696:9696 + restart: unless-stopped From 1efb6e2218411929be783611c23b44d9a5805b7f Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 5 Dec 2022 06:11:53 -0500 Subject: [PATCH 02/10] updated volumes --- media/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index a740453..6e8f6d2 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -49,7 +49,7 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - starr_data/sonarr/config:/config + - sonarr_data:/config - /mnt/share/media/tv:/tv #optional - starr_download/complete:/downloads #optional ports: @@ -63,7 +63,7 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - starr_data/radarr/config:/config + - radarr_data:/config - /mnt/share/media/movies:/movies #optional - starr_download/complete:/downloads #optional ports: @@ -77,7 +77,7 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - starr_data/lidarr/config:/config + - lidarr_data:/config - /mnt/share/media/music:/music #optional - starr_download/complete:/downloads #optional ports: @@ -91,7 +91,7 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - starr_data/prowlarr/config:/config + - prowlarr_data:/config ports: - 9696:9696 restart: unless-stopped From a109b98ddbb0fbc14e3c315248c8751a999d0d36 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 5 Dec 2022 06:34:40 -0500 Subject: [PATCH 03/10] volume restructuring --- media/docker-compose.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 6e8f6d2..b9c0ff3 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -35,9 +35,9 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - sabnzbd_data/config:/config - - starr_download/complete:/downloads - - starr_download/incomplete:/incomplete-downloads + - sabnzbd_data:/config + - download_complete:/downloads + - download_incomplete:/incomplete-downloads # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above network_mode: "service:gluetun" restart: always @@ -50,8 +50,8 @@ services: - TZ=America/New_York volumes: - sonarr_data:/config - - /mnt/share/media/tv:/tv #optional - - starr_download/complete:/downloads #optional + - /mnt/share/media/tv:/tv + - download_complete:/downloads ports: - 8989:8989 restart: always @@ -64,8 +64,8 @@ services: - TZ=America/New_York volumes: - radarr_data:/config - - /mnt/share/media/movies:/movies #optional - - starr_download/complete:/downloads #optional + - /mnt/share/media/movies:/movies + - download_complete:/downloads ports: - 7878:7878 restart: always @@ -78,8 +78,8 @@ services: - TZ=America/New_York volumes: - lidarr_data:/config - - /mnt/share/media/music:/music #optional - - starr_download/complete:/downloads #optional + - /mnt/share/media/music:/music + - download_complete:/downloads ports: - 8686:8686 restart: always @@ -95,3 +95,13 @@ services: ports: - 9696:9696 restart: unless-stopped + +volumes: + gluetun_data: + sabnzbd_data: + sonarr_data: + radarr_data: + lidarr_data: + prowlarr_data: + download_complete: + download_incomplete: From c3484d07b58c48a22eac99e67ac2fdbfe84f13de Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 5 Dec 2022 14:25:53 -0500 Subject: [PATCH 04/10] trying out diff volumes --- media/docker-compose.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index b9c0ff3..5895549 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -36,8 +36,8 @@ services: - TZ=America/New_York volumes: - sabnzbd_data:/config - - download_complete:/downloads - - download_incomplete:/incomplete-downloads + - /docker/sabnzbd/downloads:/downloads + - /docker/sabnzbd/incomplete-downloads:/incomplete-downloads # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above network_mode: "service:gluetun" restart: always @@ -49,9 +49,9 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - sonarr_data:/config - - /mnt/share/media/tv:/tv - - download_complete:/downloads + - /docker/sonarr/config:/config + - /mnt/share/media:/data + - /docker/download_complete:/downloads ports: - 8989:8989 restart: always @@ -64,8 +64,8 @@ services: - TZ=America/New_York volumes: - radarr_data:/config - - /mnt/share/media/movies:/movies - - download_complete:/downloads + - /mnt/share/media:/data + - /docker/sabnzbd/downloads:/downloads ports: - 7878:7878 restart: always @@ -78,8 +78,8 @@ services: - TZ=America/New_York volumes: - lidarr_data:/config - - /mnt/share/media/music:/music - - download_complete:/downloads + - /mnt/share/media:/data + - /docker/sabnzbd/downloads:/downloads ports: - 8686:8686 restart: always @@ -103,5 +103,3 @@ volumes: radarr_data: lidarr_data: prowlarr_data: - download_complete: - download_incomplete: From e91c477d45f8d0b86e1c8967479292f19baa6689 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Sat, 17 Dec 2022 03:12:17 +0000 Subject: [PATCH 05/10] updated volumes --- media/docker-compose.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 5895549..426226a 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -33,11 +33,12 @@ services: environment: - PUID=1000 - PGID=1000 + - UMASK=022 - TZ=America/New_York volumes: - sabnzbd_data:/config - - /docker/sabnzbd/downloads:/downloads - - /docker/sabnzbd/incomplete-downloads:/incomplete-downloads + - /data/usenet/downloads:/downloads + - /data/usenet/incomplete-downloads:/incomplete-downloads # network_mode: "service:gluetun" forces sabnzbd to connect to the internet through the VPN defined in the gluetun container above network_mode: "service:gluetun" restart: always @@ -47,11 +48,12 @@ services: environment: - PUID=1000 - PGID=1000 + - UMASK=022 - TZ=America/New_York volumes: - - /docker/sonarr/config:/config - - /mnt/share/media:/data - - /docker/download_complete:/downloads + - /docker/config/sonarr:/config + - /mnt/share/media/tv:/data + - /data/usenet/downloads:/downloads ports: - 8989:8989 restart: always @@ -61,11 +63,12 @@ services: environment: - PUID=1000 - PGID=1000 + - UMASK=022 - TZ=America/New_York volumes: - - radarr_data:/config + - /docker/config/radarr:/config - /mnt/share/media:/data - - /docker/sabnzbd/downloads:/downloads + - /data/usenet/downloads:/downloads ports: - 7878:7878 restart: always @@ -75,11 +78,12 @@ services: environment: - PUID=1000 - PGID=1000 + - UMASK=022 - TZ=America/New_York volumes: - - lidarr_data:/config - - /mnt/share/media:/data - - /docker/sabnzbd/downloads:/downloads + - /docker/config/lidarr:/config + - /mnt/share/media/music:/data + - /data/usenet/downloads:/downloads ports: - 8686:8686 restart: always @@ -91,7 +95,7 @@ services: - PGID=1000 - TZ=America/New_York volumes: - - prowlarr_data:/config + - /docker/config/prowlarr:/config ports: - 9696:9696 restart: unless-stopped @@ -99,7 +103,3 @@ services: volumes: gluetun_data: sabnzbd_data: - sonarr_data: - radarr_data: - lidarr_data: - prowlarr_data: From 1994280e11b8f803a94ca4e3acf392d8fad9262d Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 29 Dec 2022 21:58:26 +0000 Subject: [PATCH 06/10] added shell script to update all containers --- update-containers.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 update-containers.sh diff --git a/update-containers.sh b/update-containers.sh new file mode 100755 index 0000000..d1afc6f --- /dev/null +++ b/update-containers.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# go to "docker/media" folder +cd ~/docker/media + +# stop docker +echo "Stopping docker" +docker compose down + +ERROR_FILE="/tmp/docker-images-update.error" + +# make sure that docker is running +DOCKER_INFO_OUTPUT=$(docker info 2> /dev/null | grep "Containers:" | awk '{print $1}') + +if [ "$DOCKER_INFO_OUTPUT" == "Containers:" ] + then + echo "Docker is running, so we can continue" + else + echo "Docker is not running, exiting" + exit 1 +fi + +# get a list of docker images that are currently installed +IMAGES_WITH_TAGS=$(docker images | grep -v REPOSITORY | grep -v TAG | grep -v "" | awk '{printf("%s:%s\n", $1, $2)}') + +# run docker pull on all of the images +for IMAGE in $IMAGES_WITH_TAGS; do + echo "*****" + echo "Updating $IMAGE" + docker pull $IMAGE 2> $ERROR_FILE + if [ $? != 0 ]; then + ERROR=$(cat $ERROR_FILE | grep "not found") + if [ "$ERROR" != "" ]; then + echo "WARNING: Docker image $IMAGE not found in repository, skipping" + else + echo "ERROR: docker pull failed on image - $IMAGE" + exit 2 + fi + fi + echo "*****" + echo +done + +# restart docker +echo "Restarting Docker" +docker compose up -d + +# did everything finish correctly? Then we can exit +echo "Docker images are now up to date" +exit 0 From 96f4e04e4580627a5c08ad7c5ec7656b5e72ea99 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Sat, 31 Dec 2022 02:56:57 +0000 Subject: [PATCH 07/10] updated volume mappings --- media/docker-compose.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 426226a..ce0e58c 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -52,7 +52,9 @@ services: - TZ=America/New_York volumes: - /docker/config/sonarr:/config - - /mnt/share/media/tv:/data + - /mnt/share/media/tv:/tv + - /mnt/share/media/anime:/anime + - /mnt/share/media/babies:/babies - /data/usenet/downloads:/downloads ports: - 8989:8989 @@ -68,6 +70,7 @@ services: volumes: - /docker/config/radarr:/config - /mnt/share/media:/data + - /mnt/share/media/movies:/movies - /data/usenet/downloads:/downloads ports: - 7878:7878 @@ -82,7 +85,7 @@ services: - TZ=America/New_York volumes: - /docker/config/lidarr:/config - - /mnt/share/media/music:/data + - /mnt/share/media/music:/music - /data/usenet/downloads:/downloads ports: - 8686:8686 From 9a6d1f4c2b428bdeab36afefe4494c555b882298 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Mon, 9 Jan 2023 02:20:26 +0000 Subject: [PATCH 08/10] update prowlarr to latest tag --- media/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index ce0e58c..0b148c5 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -91,7 +91,7 @@ services: - 8686:8686 restart: always prowlarr: - image: lscr.io/linuxserver/prowlarr:develop + image: lscr.io/linuxserver/prowlarr:latest container_name: prowlarr environment: - PUID=1000 From 187ecf45c36325c72cda399855c2e837c07365f1 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Thu, 12 Jan 2023 21:09:12 +0000 Subject: [PATCH 09/10] added kids movies root folder to radarr --- media/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/media/docker-compose.yml b/media/docker-compose.yml index 0b148c5..4689b93 100644 --- a/media/docker-compose.yml +++ b/media/docker-compose.yml @@ -71,6 +71,7 @@ services: - /docker/config/radarr:/config - /mnt/share/media:/data - /mnt/share/media/movies:/movies + - /mnt/share/media/movies for the kids:/movies for the kids - /data/usenet/downloads:/downloads ports: - 7878:7878 From d6d52bfc4f5e0989bf393f9e155e312cfb457863 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Sat, 11 Feb 2023 12:37:45 +0000 Subject: [PATCH 10/10] added postgres and pgadmin instance --- database/docker-compose.yml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 database/docker-compose.yml diff --git a/database/docker-compose.yml b/database/docker-compose.yml new file mode 100644 index 0000000..c65f5c5 --- /dev/null +++ b/database/docker-compose.yml @@ -0,0 +1,40 @@ +version: '3.5' + +services: + postgres: + container_name: postgres_container + image: postgres + environment: + POSTGRES_USER: ${POSTGRES_USER:-acedanger} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-changeme} + PGDATA: /data/postgres + volumes: + - postgres_data:/data/postgres + ports: + - "5432:5432" + networks: + - postgres + restart: unless-stopped + + pgadmin: + container_name: pgadmin_container + image: dpage/pgadmin4 + environment: + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-peter@peterwood.dev} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin} + PGADMIN_CONFIG_SERVER_MODE: 'False' + volumes: + - pgadmin_data:/var/lib/pgadmin + ports: + - "${PGADMIN_PORT:-5050}:80" + networks: + - postgres + restart: unless-stopped + +networks: + postgres: + driver: bridge + +volumes: + postgres_data: + pgadmin_data: