diff --git a/docker-compose/.env b/docker-compose/.env new file mode 120000 index 0000000..faf917a --- /dev/null +++ b/docker-compose/.env @@ -0,0 +1 @@ +/etc/.soupclown.env \ No newline at end of file diff --git a/docker-compose/.gitignore b/docker-compose/.gitignore new file mode 100644 index 0000000..1e18f27 --- /dev/null +++ b/docker-compose/.gitignore @@ -0,0 +1 @@ +!.env \ No newline at end of file diff --git a/docker-compose/all-down.sh b/docker-compose/all-down.sh deleted file mode 100755 index 9fce9cd..0000000 --- a/docker-compose/all-down.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/run/current-system/sw/bin/bash - -SERVICE_NAMES=( - # "paperless" - "downloadin" - # "matrix" -) -for SERVICE in "${SERVICE_NAMES[@]}"; do - docker compose --env-file /etc/.soupclown.env -f $(pwd)/${SERVICE}-compose.yaml down -done diff --git a/docker-compose/all-pull.sh b/docker-compose/all-pull.sh deleted file mode 100755 index a15686e..0000000 --- a/docker-compose/all-pull.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/run/current-system/sw/bin/bash - -SERVICE_NAMES=( - # "paperless" - "downloadin" - # "matrix" -) -for SERVICE in "${SERVICE_NAMES[@]}"; do - docker compose --env-file /etc/.soupclown.env -f $(pwd)/${SERVICE}-compose.yaml pull -done diff --git a/docker-compose/all-up.sh b/docker-compose/all-up.sh deleted file mode 100755 index ef4fd15..0000000 --- a/docker-compose/all-up.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/run/current-system/sw/bin/bash - -SERVICE_NAMES=( - # "paperless" - "downloadin" - # "matrix" -) -for SERVICE in "${SERVICE_NAMES[@]}"; do - docker compose --env-file /etc/.soupclown.env -f $(pwd)/${SERVICE}-compose.yaml up -d -done diff --git a/docker-compose/bin/metube-options.json b/docker-compose/bin/metube-options.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/docker-compose/bin/metube-options.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/docker-compose/downloadin-compose.yaml b/docker-compose/compose.yaml similarity index 88% rename from docker-compose/downloadin-compose.yaml rename to docker-compose/compose.yaml index c9a5ced..1284829 100644 --- a/docker-compose/downloadin-compose.yaml +++ b/docker-compose/compose.yaml @@ -1,6 +1,8 @@ services: vpn: container_name: vpn + profiles: + - download image: qmcgaw/gluetun:v3.40 cap_add: - NET_ADMIN # Quin does not like these @@ -33,8 +35,10 @@ services: restart: unless-stopped transmission: - image: lscr.io/linuxserver/transmission:latest container_name: transmission + profiles: + - download + image: lscr.io/linuxserver/transmission:latest network_mode: "service:vpn" environment: - TZ=${TZ} @@ -47,6 +51,8 @@ services: prowlarr: container_name: prowlarr + profiles: + - download image: lscr.io/linuxserver/prowlarr:latest network_mode: "service:vpn" environment: @@ -63,9 +69,11 @@ services: restart: unless-stopped radarr: + container_name: radarr + profiles: + - download image: lscr.io/linuxserver/radarr:latest network_mode: "service:vpn" - container_name: radarr environment: - PUID=1000 - PGID=1000 @@ -87,9 +95,11 @@ services: restart: unless-stopped sonarr: + container_name: sonarr + profiles: + - download image: lscr.io/linuxserver/sonarr:latest network_mode: "service:vpn" - container_name: sonarr environment: - PUID=1000 - PGID=1000 @@ -111,8 +121,10 @@ services: restart: unless-stopped bitmagnet: - image: ghcr.io/bitmagnet-io/bitmagnet:latest container_name: bitmagnet + profiles: + - download + image: ghcr.io/bitmagnet-io/bitmagnet:latest restart: unless-stopped network_mode: "service:vpn" environment: @@ -132,8 +144,10 @@ services: condition: service_healthy postgres: - image: postgres:16-alpine container_name: bitmagnet-postgres + profiles: + - download + image: postgres:16-alpine network_mode: "service:vpn" volumes: - ${SOUPCLOWN_ETC_PATH}/downloadin/bitmagnet/postgresdata:/var/lib/postgresql/data @@ -151,9 +165,11 @@ services: interval: 10s seerr: + container_name: seerr + profiles: + - download image: ghcr.io/seerr-team/seerr:latest init: true - container_name: seerr restart: unless-stopped ports: - 5055:5055 @@ -170,6 +186,8 @@ services: retries: 3 navidrome: + profiles: + - app container_name: navidrome image: deluan/navidrome:latest user: 1000:1000 @@ -179,3 +197,17 @@ services: - ${SOUPCLOWN_ETC_PATH}/navidrome:/data - /mnt/mega/app_data/beets/beetsMusic/:/music1 restart: unless-stopped + + metube: + profiles: + - app + image: ghcr.io/alexta69/metube + container_name: metube + restart: unless-stopped + ports: + - "8081:8081" + volumes: + - /mnt/media2/app_data/metube/downloads:/downloads + - ./bin/metube-options.json:/config/metube-options.json + environment: + - YTDL_OPTIONS_FILE=/config/metube-options.json \ No newline at end of file diff --git a/modules/user-quin.nix b/modules/user-quin.nix index 944120f..178aadd 100644 --- a/modules/user-quin.nix +++ b/modules/user-quin.nix @@ -36,6 +36,7 @@ jellyfin-desktop renpy bun + wine ]; };