From 33c45bf785d9076d409566709213df51d76b77e5 Mon Sep 17 00:00:00 2001 From: poslop Date: Thu, 26 Sep 2024 14:20:01 -0500 Subject: [PATCH 01/10] prep for seperating compose into srevices --- docker-compose.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 18af700..99b7104 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,20 @@ networks: name: bookstack services: + anki: + image: ghcr.io/luckyturtledev/anki + container_name: anki + environment: + - SYNC_USER1=poslop:${PASS} + - RUST_LOG=info + ports: + - 10080:8080 + volumes: + - anki:/data + restart: unless-stopped + networks: + - caddy + bookstack: image: lscr.io/linuxserver/bookstack container_name: bookstack @@ -333,6 +347,8 @@ services: volumes: + anki: + name: anki caddy_config: name: caddy_config caddy_data: From c2bf5cc4433b56e2794964a37e1ba21ed26948a4 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 11:58:24 -0500 Subject: [PATCH 02/10] bookstack --- .../Bookstack/bookstack-stack.yml | 58 +++++++++++ .../Shared/docker-compose.networks.yml | 13 +++ docker-compose.yml | 95 +++++++++---------- 3 files changed, 116 insertions(+), 50 deletions(-) create mode 100644 docker-compose.d/Bookstack/bookstack-stack.yml create mode 100644 docker-compose.d/Shared/docker-compose.networks.yml diff --git a/docker-compose.d/Bookstack/bookstack-stack.yml b/docker-compose.d/Bookstack/bookstack-stack.yml new file mode 100644 index 0000000..2858b3f --- /dev/null +++ b/docker-compose.d/Bookstack/bookstack-stack.yml @@ -0,0 +1,58 @@ +services: + bookstack: + image: lscr.io/linuxserver/bookstack + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Chicago + - APP_URL=https://bookstack.mintyserver.net + - DB_HOST=bookstack_db + - DB_PORT=3306 + - DB_USER=bookstack + - DB_PASS=/run/secrets/PASS + - DB_DATABASE=bookstackapp + volumes: + - bookstack:/config + depends_on: + - bookstack_db + ports: + - 8989:80 + secrets: + - PASS + networks: + - caddy + - bookstack + + bookstack_db: + image: lscr.io/linuxserver/mariadb + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Chicago + - MYSQL_ROOT_PASSWORD=/run/secrets/PASS + - MYSQL_DATABASE=bookstackapp + - MYSQL_USER=bookstack + - MYSQL_PASSWORD=/run/secrets/PASS + volumes: + - bookstack_db:/config + secrets: + - PASS + networks: + - bookstack + +networks: + caddy: + name: caddy + external: true + bookstack: + name: bookstack + +volumes: + bookstack: + name: bookstack + bookstack_db: + name: bookstack_db + +secrets: + PASS: + external: true diff --git a/docker-compose.d/Shared/docker-compose.networks.yml b/docker-compose.d/Shared/docker-compose.networks.yml new file mode 100644 index 0000000..422fdfd --- /dev/null +++ b/docker-compose.d/Shared/docker-compose.networks.yml @@ -0,0 +1,13 @@ + +networks: + caddy: + name: caddy + qbit: + name: qbit + shoko: + name: shoko + arr: + name: arr + bookstack: + name: bookstack + diff --git a/docker-compose.yml b/docker-compose.yml index 99b7104..7919acc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,15 @@ networks: caddy: name: caddy + external: true qbit: name: qbit shoko: name: shoko arr: name: arr - bookstack: - name: bookstack + #bookstack: + #name: bookstack services: anki: @@ -25,52 +26,46 @@ services: networks: - caddy - bookstack: - image: lscr.io/linuxserver/bookstack - container_name: bookstack - environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Chicago - - APP_URL=https://bookstack.mintyserver.net - - DB_HOST=bookstack_db - - DB_PORT=3306 - - DB_USER=bookstack - - DB_PASS=${PASS} - - DB_DATABASE=bookstackapp - volumes: - - bookstack:/config - restart: unless-stopped - depends_on: - - bookstack_db - networks: - - caddy - - bookstack - - bookstack_db: - image: lscr.io/linuxserver/mariadb - container_name: bookstack_db - environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Chicago - - MYSQL_ROOT_PASSWORD=${PASS} - - MYSQL_DATABASE=bookstackapp - - MYSQL_USER=bookstack - - MYSQL_PASSWORD=${PASS} - volumes: - - bookstack_db:/config - restart: unless-stopped - networks: - - bookstack + #bookstack: + # image: lscr.io/linuxserver/bookstack + # container_name: bookstack + # environment: + # - PUID=1000 + # - PGID=1000 + # - TZ=America/Chicago + # - APP_URL=https://bookstack.mintyserver.net + # - DB_HOST=bookstack_db + # - DB_PORT=3306 + # - DB_USER=bookstack + # - DB_PASS=${PASS} + # - DB_DATABASE=bookstackapp + # volumes: + # - bookstack:/config + # restart: unless-stopped + # depends_on: + # - bookstack_db + # networks: + # - caddy + # - bookstack + # + #bookstack_db: + # image: lscr.io/linuxserver/mariadb + # container_name: bookstack_db + # environment: + # - PUID=1000 + # - PGID=1000 + # - TZ=America/Chicago + # - MYSQL_ROOT_PASSWORD=${PASS} + # - MYSQL_DATABASE=bookstackapp + # - MYSQL_USER=bookstack + # - MYSQL_PASSWORD=${PASS} + # volumes: + # - bookstack_db:/config + # restart: unless-stopped + # networks: + # - bookstack - maigret: - image: soxoj/maigret:latest - container_name: maigret - volumes: - - /mnt/nextcloud/poslop/Maigret:/app/reports - gluetun: image: ghcr.io/qdm12/gluetun cap_add: @@ -393,7 +388,7 @@ volumes: name: p2pool-data gluetun: name: gluetun - bookstack: - name: bookstack - bookstack_db: - name: booksstack_db + # bookstack: + # name: bookstack + # bookstack_db: + # name: bookstack_db From c03b641fd8b66f338e07136f214d34425913efc7 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 12:15:32 -0500 Subject: [PATCH 03/10] convert gitea to stack --- docker-compose.d/Gitea/gitea-stack.yml | 25 ++++++++++++++++++ docker-compose.yml | 36 +++++++++++++------------- 2 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 docker-compose.d/Gitea/gitea-stack.yml diff --git a/docker-compose.d/Gitea/gitea-stack.yml b/docker-compose.d/Gitea/gitea-stack.yml new file mode 100644 index 0000000..48406c0 --- /dev/null +++ b/docker-compose.d/Gitea/gitea-stack.yml @@ -0,0 +1,25 @@ +services: + gitea: + image: gitea/gitea:latest + environment: + - GITEA__service__DISABLE_REGISTRATION=true + - USER_UID=1000 + - USER_GID=1000 + restart: always + volumes: + - gitea:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + #ports: + #- "3030:3000" + networks: + - caddy + +networks: + caddy: + name: caddy + external: true + +volumes: + gitea: + name: gitea diff --git a/docker-compose.yml b/docker-compose.yml index 7919acc..19eb6ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -282,22 +282,22 @@ services: networks: - caddy - gitea: - image: gitea/gitea:latest - container_name: gitea - environment: - - GITEA__service__DISABLE_REGISTRATION=true - - USER_UID=1000 - - USER_GID=1000 - restart: always - volumes: - - gitea:/data - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - ports: - - "3030:3000" - networks: - - caddy + #gitea: + # image: gitea/gitea:latest + # container_name: gitea + # environment: + # - GITEA__service__DISABLE_REGISTRATION=true + # - USER_UID=1000 + # - USER_GID=1000 + # restart: always + # volumes: + # - gitea:/data + # - /etc/timezone:/etc/timezone:ro + # - /etc/localtime:/etc/localtime:ro + # ports: + # - "3030:3000" + # networks: + # - caddy jellyfin: image: lscr.io/linuxserver/jellyfin:latest @@ -370,8 +370,8 @@ volumes: external: true jellyfin: name: jellyfin - gitea: - name: gitea + #gitea: + #name: gitea technitium: name: technitium external: true From c50d2ce03a5d9e53be46b89206fd5ce2b2c45064 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 12:46:41 -0500 Subject: [PATCH 04/10] convert vault to stack --- .../Vaultwarden/vaultwarden-stack.yml | 23 ++++++++++++ docker-compose.yml | 36 +++++++++---------- 2 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 docker-compose.d/Vaultwarden/vaultwarden-stack.yml diff --git a/docker-compose.d/Vaultwarden/vaultwarden-stack.yml b/docker-compose.d/Vaultwarden/vaultwarden-stack.yml new file mode 100644 index 0000000..85ebb9b --- /dev/null +++ b/docker-compose.d/Vaultwarden/vaultwarden-stack.yml @@ -0,0 +1,23 @@ +services: + vaultwarden: + image: vaultwarden/server:latest + environment: + - DOMAIN=https://vault.mintyserver.net + - WEBSOCKET_ENABLED=true + - SIGNUPS_ALLOWED=false + - ADMIN_TOKEN=/run/secrets/PASS + volumes: + - vaultwarden:/data + networks: + - caddy + #ports: + #- 8089:80 + +networks: + caddy: + name: caddy + external: true + +volumes: + vaultwarden: + name: vaultwarden diff --git a/docker-compose.yml b/docker-compose.yml index 19eb6ba..ec32f72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -185,21 +185,21 @@ services: - shoko - vaultwarden: - image: vaultwarden/server:latest - container_name: vaultwarden - restart: unless-stopped - environment: - DOMAIN: "https://vault.mintyserver.net" - WEBSOCKET_ENABLED: true - SIGNUPS_ALLOWED: false - ADMIN_TOKEN: ${PASS} - volumes: - - vaultwarden:/data - networks: - - caddy - ports: - - 8089:80 + #vaultwarden: + # image: vaultwarden/server:latest + # container_name: vaultwarden + # restart: unless-stopped + # environment: + # DOMAIN: "https://vault.mintyserver.net" + # WEBSOCKET_ENABLED: true + # SIGNUPS_ALLOWED: false + # ADMIN_TOKEN: ${PASS} + # volumes: + # - vaultwarden:/data + # networks: + # - caddy + # ports: + # - 8089:80 monerod: @@ -352,9 +352,9 @@ volumes: name: caddy_srv caddy_set: name: caddy_set - vaultwarden: - name: vaultwarden - external: true + #vaultwarden: + #name: vaultwarden + #external: true qbittorrent: name: qbittorrent external: true From 37c1448334d94836c5e675badda4d156a389ddb4 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 13:05:34 -0500 Subject: [PATCH 05/10] convert searxng to stack --- docker-compose.d/Searxng/searxng-stack.yml | 18 +++++++++++++++ docker-compose.yml | 26 +++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 docker-compose.d/Searxng/searxng-stack.yml diff --git a/docker-compose.d/Searxng/searxng-stack.yml b/docker-compose.d/Searxng/searxng-stack.yml new file mode 100644 index 0000000..6f15791 --- /dev/null +++ b/docker-compose.d/Searxng/searxng-stack.yml @@ -0,0 +1,18 @@ +services: + searxng: + image: searxng/searxng:latest + environment: + - BASE_URL=https://searxng.mintyserver.net + volumes: + - searxng:/etc/searxng + networks: + - caddy + +networks: + caddy: + name: caddy + external: true + +volumes: + searxng: + name: searxng diff --git a/docker-compose.yml b/docker-compose.yml index ec32f72..61a40b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -260,16 +260,16 @@ services: networks: - caddy - searxng: - image: searxng/searxng:latest - container_name: searxng - environment: - - BASE_URL=https://searxng.mintyserver.net - volumes: - - searxng:/etc/searxng - restart: unless-stopped - networks: - - caddy + #searxng: + # image: searxng/searxng:latest + # container_name: searxng + # environment: + # - BASE_URL=https://searxng.mintyserver.net + # volumes: + # - searxng:/etc/searxng + # restart: unless-stopped + # networks: + # - caddy puffer: image: pufferpanel/pufferpanel:latest @@ -365,9 +365,9 @@ volumes: name: ariang puffer-config: name: puffer-config - searxng: - name: searxng - external: true + #searxng: + #name: searxng + #external: true jellyfin: name: jellyfin #gitea: From 296c755f8363b37145b9a4c5219fb496b99887a0 Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 13:53:29 -0500 Subject: [PATCH 06/10] convert jellyfin to stack --- .../bookstack-stack.yml | 0 .../{Gitea => Documentation}/gitea-stack.yml | 0 .../vaultwarden-stack.yml | 0 docker-compose.d/Media/jellyfin-stack.yml | 27 ++++ docker-compose.yml | 122 +----------------- 5 files changed, 28 insertions(+), 121 deletions(-) rename docker-compose.d/{Bookstack => Documentation}/bookstack-stack.yml (100%) rename docker-compose.d/{Gitea => Documentation}/gitea-stack.yml (100%) rename docker-compose.d/{Vaultwarden => Documentation}/vaultwarden-stack.yml (100%) create mode 100644 docker-compose.d/Media/jellyfin-stack.yml diff --git a/docker-compose.d/Bookstack/bookstack-stack.yml b/docker-compose.d/Documentation/bookstack-stack.yml similarity index 100% rename from docker-compose.d/Bookstack/bookstack-stack.yml rename to docker-compose.d/Documentation/bookstack-stack.yml diff --git a/docker-compose.d/Gitea/gitea-stack.yml b/docker-compose.d/Documentation/gitea-stack.yml similarity index 100% rename from docker-compose.d/Gitea/gitea-stack.yml rename to docker-compose.d/Documentation/gitea-stack.yml diff --git a/docker-compose.d/Vaultwarden/vaultwarden-stack.yml b/docker-compose.d/Documentation/vaultwarden-stack.yml similarity index 100% rename from docker-compose.d/Vaultwarden/vaultwarden-stack.yml rename to docker-compose.d/Documentation/vaultwarden-stack.yml diff --git a/docker-compose.d/Media/jellyfin-stack.yml b/docker-compose.d/Media/jellyfin-stack.yml new file mode 100644 index 0000000..3d4fd98 --- /dev/null +++ b/docker-compose.d/Media/jellyfin-stack.yml @@ -0,0 +1,27 @@ +services: + jellyfin: + image: lscr.io/linuxserver/jellyfin:latest + devices: + - /dev/dri:/dev/dri + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Chicago + volumes: + - jellyfin:/config + - /mnt/massdrive/media:/data + networks: + - caddy + - shoko + +networks: + caddy: + name: caddy + external: true + shoko: + name: shoko + external: true + +volumes: + jellyfin: + name: jellyfin diff --git a/docker-compose.yml b/docker-compose.yml index 61a40b6..adfc9dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,9 @@ networks: name: qbit shoko: name: shoko + external: true arr: name: arr - #bookstack: - #name: bookstack services: anki: @@ -26,46 +25,6 @@ services: networks: - caddy - #bookstack: - # image: lscr.io/linuxserver/bookstack - # container_name: bookstack - # environment: - # - PUID=1000 - # - PGID=1000 - # - TZ=America/Chicago - # - APP_URL=https://bookstack.mintyserver.net - # - DB_HOST=bookstack_db - # - DB_PORT=3306 - # - DB_USER=bookstack - # - DB_PASS=${PASS} - # - DB_DATABASE=bookstackapp - # volumes: - # - bookstack:/config - # restart: unless-stopped - # depends_on: - # - bookstack_db - # networks: - # - caddy - # - bookstack - # - #bookstack_db: - # image: lscr.io/linuxserver/mariadb - # container_name: bookstack_db - # environment: - # - PUID=1000 - # - PGID=1000 - # - TZ=America/Chicago - # - MYSQL_ROOT_PASSWORD=${PASS} - # - MYSQL_DATABASE=bookstackapp - # - MYSQL_USER=bookstack - # - MYSQL_PASSWORD=${PASS} - # volumes: - # - bookstack_db:/config - # restart: unless-stopped - # networks: - # - bookstack - - gluetun: image: ghcr.io/qdm12/gluetun cap_add: @@ -184,24 +143,6 @@ services: networks: - shoko - - #vaultwarden: - # image: vaultwarden/server:latest - # container_name: vaultwarden - # restart: unless-stopped - # environment: - # DOMAIN: "https://vault.mintyserver.net" - # WEBSOCKET_ENABLED: true - # SIGNUPS_ALLOWED: false - # ADMIN_TOKEN: ${PASS} - # volumes: - # - vaultwarden:/data - # networks: - # - caddy - # ports: - # - 8089:80 - - monerod: image: sethsimmons/simple-monerod:latest restart: unless-stopped @@ -260,17 +201,6 @@ services: networks: - caddy - #searxng: - # image: searxng/searxng:latest - # container_name: searxng - # environment: - # - BASE_URL=https://searxng.mintyserver.net - # volumes: - # - searxng:/etc/searxng - # restart: unless-stopped - # networks: - # - caddy - puffer: image: pufferpanel/pufferpanel:latest container_name: puffer @@ -282,42 +212,6 @@ services: networks: - caddy - #gitea: - # image: gitea/gitea:latest - # container_name: gitea - # environment: - # - GITEA__service__DISABLE_REGISTRATION=true - # - USER_UID=1000 - # - USER_GID=1000 - # restart: always - # volumes: - # - gitea:/data - # - /etc/timezone:/etc/timezone:ro - # - /etc/localtime:/etc/localtime:ro - # ports: - # - "3030:3000" - # networks: - # - caddy - - jellyfin: - image: lscr.io/linuxserver/jellyfin:latest - container_name: jellyfin - devices: - - /dev/dri:/dev/dri - environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Chicago - volumes: - - jellyfin:/config - - /mnt/massdrive/media:/data - ports: - - 8096:8096 - restart: unless-stopped - networks: - - caddy - - shoko - nextcloud: container_name: nextcloud-aio-mastercontainer init: true @@ -352,9 +246,6 @@ volumes: name: caddy_srv caddy_set: name: caddy_set - #vaultwarden: - #name: vaultwarden - #external: true qbittorrent: name: qbittorrent external: true @@ -365,13 +256,6 @@ volumes: name: ariang puffer-config: name: puffer-config - #searxng: - #name: searxng - #external: true - jellyfin: - name: jellyfin - #gitea: - #name: gitea technitium: name: technitium external: true @@ -388,7 +272,3 @@ volumes: name: p2pool-data gluetun: name: gluetun - # bookstack: - # name: bookstack - # bookstack_db: - # name: bookstack_db From e7952e97f884bccbd3ff3d34770c5fd56c4b7ffc Mon Sep 17 00:00:00 2001 From: poslop Date: Fri, 11 Oct 2024 15:27:12 -0500 Subject: [PATCH 07/10] convert technitium to stack --- .../Documentation/gitea-stack.yml | 3 -- .../Documentation/vaultwarden-stack.yml | 8 +++- .../Networking/technitium-stack.yml | 25 +++++++++++ .../Shared/docker-compose.networks.yml | 13 ------ .../{Searxng => Tools}/searxng-stack.yml | 0 docker-compose.yml | 44 ------------------- 6 files changed, 31 insertions(+), 62 deletions(-) create mode 100644 docker-compose.d/Networking/technitium-stack.yml delete mode 100644 docker-compose.d/Shared/docker-compose.networks.yml rename docker-compose.d/{Searxng => Tools}/searxng-stack.yml (100%) diff --git a/docker-compose.d/Documentation/gitea-stack.yml b/docker-compose.d/Documentation/gitea-stack.yml index 48406c0..2fd2c97 100644 --- a/docker-compose.d/Documentation/gitea-stack.yml +++ b/docker-compose.d/Documentation/gitea-stack.yml @@ -5,13 +5,10 @@ services: - GITEA__service__DISABLE_REGISTRATION=true - USER_UID=1000 - USER_GID=1000 - restart: always volumes: - gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - #ports: - #- "3030:3000" networks: - caddy diff --git a/docker-compose.d/Documentation/vaultwarden-stack.yml b/docker-compose.d/Documentation/vaultwarden-stack.yml index 85ebb9b..54121c0 100644 --- a/docker-compose.d/Documentation/vaultwarden-stack.yml +++ b/docker-compose.d/Documentation/vaultwarden-stack.yml @@ -10,8 +10,8 @@ services: - vaultwarden:/data networks: - caddy - #ports: - #- 8089:80 + secrets: + - PASS networks: caddy: @@ -21,3 +21,7 @@ networks: volumes: vaultwarden: name: vaultwarden + +secrets: + PASS: + external: true diff --git a/docker-compose.d/Networking/technitium-stack.yml b/docker-compose.d/Networking/technitium-stack.yml new file mode 100644 index 0000000..5dc8072 --- /dev/null +++ b/docker-compose.d/Networking/technitium-stack.yml @@ -0,0 +1,25 @@ +services: + technitium: + image: technitium/dns-server:latest + environment: + - DNS_SERVER_DOMAIN=technitium + - DNS_SERVER_ADMIN_PASSWORD=/run/secrets/PASS + volumes: + - technitium:/etc/dns + secrets: + - PASS + networks: + - host + +volumes: + technitium: + name: technitium + +secrets: + PASS: + external: true + +networks: + host: + name: host + external: true diff --git a/docker-compose.d/Shared/docker-compose.networks.yml b/docker-compose.d/Shared/docker-compose.networks.yml deleted file mode 100644 index 422fdfd..0000000 --- a/docker-compose.d/Shared/docker-compose.networks.yml +++ /dev/null @@ -1,13 +0,0 @@ - -networks: - caddy: - name: caddy - qbit: - name: qbit - shoko: - name: shoko - arr: - name: arr - bookstack: - name: bookstack - diff --git a/docker-compose.d/Searxng/searxng-stack.yml b/docker-compose.d/Tools/searxng-stack.yml similarity index 100% rename from docker-compose.d/Searxng/searxng-stack.yml rename to docker-compose.d/Tools/searxng-stack.yml diff --git a/docker-compose.yml b/docker-compose.yml index adfc9dd..931ed75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,20 +11,6 @@ networks: name: arr services: - anki: - image: ghcr.io/luckyturtledev/anki - container_name: anki - environment: - - SYNC_USER1=poslop:${PASS} - - RUST_LOG=info - ports: - - 10080:8080 - volumes: - - anki:/data - restart: unless-stopped - networks: - - caddy - gluetun: image: ghcr.io/qdm12/gluetun cap_add: @@ -64,18 +50,6 @@ services: networks: - caddy - - technitium: - container_name: technitium - image: technitium/dns-server:latest - network_mode: "host" - environment: - - DNS_SERVER_DOMAIN=technitium - - DNS_SERVER_ADMIN_PASSWORD=${PASS} - volumes: - - technitium:/etc/dns - restart: unless-stopped - prowlarr: image: lscr.io/linuxserver/prowlarr:latest container_name: prowlarr @@ -201,17 +175,6 @@ services: networks: - caddy - puffer: - image: pufferpanel/pufferpanel:latest - container_name: puffer - restart: always - volumes: - - puffer-config:/etc/pufferpanel - - /var/lib/pufferpanel:/var/lib/pufferpanel - - /var/run/docker.sock:/var/run/docker.sock - networks: - - caddy - nextcloud: container_name: nextcloud-aio-mastercontainer init: true @@ -236,8 +199,6 @@ services: volumes: - anki: - name: anki caddy_config: name: caddy_config caddy_data: @@ -254,11 +215,6 @@ volumes: external: true ariang: name: ariang - puffer-config: - name: puffer-config - technitium: - name: technitium - external: true sonarr: name: sonarr prowlarr: From 0e5da4b9f14eab3b417a70c8ad026f500a214265 Mon Sep 17 00:00:00 2001 From: poslop Date: Mon, 14 Oct 2024 13:24:51 -0500 Subject: [PATCH 08/10] convert arr to stack --- .../Documentation/bookstack-stack.yml | 2 - docker-compose.d/Media/arr-stack.yml | 43 +++++++++++++++++++ docker-compose.yml | 40 ----------------- 3 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 docker-compose.d/Media/arr-stack.yml diff --git a/docker-compose.d/Documentation/bookstack-stack.yml b/docker-compose.d/Documentation/bookstack-stack.yml index 2858b3f..60857bf 100644 --- a/docker-compose.d/Documentation/bookstack-stack.yml +++ b/docker-compose.d/Documentation/bookstack-stack.yml @@ -15,8 +15,6 @@ services: - bookstack:/config depends_on: - bookstack_db - ports: - - 8989:80 secrets: - PASS networks: diff --git a/docker-compose.d/Media/arr-stack.yml b/docker-compose.d/Media/arr-stack.yml new file mode 100644 index 0000000..84479aa --- /dev/null +++ b/docker-compose.d/Media/arr-stack.yml @@ -0,0 +1,43 @@ +services: + prowlarr: + image: lscr.io/linuxserver/prowlarr:latest + environment: + - PUID=1000 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - prowlarr:/config + ports: + - 9696:9696 + networks: + - arr + - qbit + + sonarr: + image: lscr.io/linuxserver/sonarr:latest + environment: + - PUID=1000 + - PGID=1000 + - TZ=Etc/UTC + volumes: + - sonarr:/config + - /mnt/massdrive/media:/mnt/media + ports: + - 8989:8989 + networks: + - arr + - qbit + +networks: + arr: + name: arr + external: true + qbit: + name: qbit + external: true + +volumes: + prowlarr: + name: prowlarr + sonarr: + name: sonarr diff --git a/docker-compose.yml b/docker-compose.yml index 931ed75..0f9044b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,6 @@ networks: shoko: name: shoko external: true - arr: - name: arr services: gluetun: @@ -50,39 +48,6 @@ services: networks: - caddy - prowlarr: - image: lscr.io/linuxserver/prowlarr:latest - container_name: prowlarr - environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - volumes: - - prowlarr:/config - ports: - - 9696:9696 - restart: unless-stopped - networks: - - arr - - qbit - - sonarr: - image: lscr.io/linuxserver/sonarr:latest - container_name: sonarr - environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - volumes: - - sonarr:/config - - /mnt/massdrive/media:/mnt/media - ports: - - 8989:8989 - restart: unless-stopped - networks: - - arr - - qbit - qbittorrent: image: lscr.io/linuxserver/qbittorrent:latest container_name: qbittorrent @@ -215,11 +180,6 @@ volumes: external: true ariang: name: ariang - sonarr: - name: sonarr - prowlarr: - name: prowlarr - external: true nextcloud_aio_mastercontainer: name: nextcloud_aio_mastercontainer bitmonero: From e64814cebbb5e258427cda385ca5202f191a3063 Mon Sep 17 00:00:00 2001 From: poslop Date: Tue, 29 Oct 2024 13:51:35 -0500 Subject: [PATCH 09/10] removed stacks and using normal docker but with seperated compose files --- .../{bookstack-stack.yml => bookstack.yml} | 20 +- .../{gitea-stack.yml => gitea.yml} | 3 + ...{vaultwarden-stack.yml => vaultwarden.yml} | 19 +- .../Media/{arr-stack.yml => arr.yml} | 6 + .../{jellyfin-stack.yml => jellyfin.yml} | 9 +- docker-compose.d/Media/shoko.yml | 27 +++ docker-compose.d/Networking/caddy.yml | 37 ++++ docker-compose.d/Networking/gluetun.yml | 31 +++ .../Networking/technitium-stack.yml | 25 --- docker-compose.d/Networking/technitium.yml | 17 ++ docker-compose.d/Tools/ariang.yml | 27 +++ docker-compose.d/Tools/monerod.yml | 27 +++ docker-compose.d/Tools/nextcloud-aio.yml | 21 ++ docker-compose.d/Tools/p2pool.yml | 23 +++ .../Tools/{searxng-stack.yml => searxng.yml} | 7 +- docker-compose.yml | 190 ------------------ scripts/run-all.sh | 41 ++++ 17 files changed, 289 insertions(+), 241 deletions(-) rename docker-compose.d/Documentation/{bookstack-stack.yml => bookstack.yml} (79%) rename docker-compose.d/Documentation/{gitea-stack.yml => gitea.yml} (84%) rename docker-compose.d/Documentation/{vaultwarden-stack.yml => vaultwarden.yml} (51%) rename docker-compose.d/Media/{arr-stack.yml => arr.yml} (81%) rename docker-compose.d/Media/{jellyfin-stack.yml => jellyfin.yml} (75%) create mode 100644 docker-compose.d/Media/shoko.yml create mode 100644 docker-compose.d/Networking/caddy.yml create mode 100644 docker-compose.d/Networking/gluetun.yml delete mode 100644 docker-compose.d/Networking/technitium-stack.yml create mode 100644 docker-compose.d/Networking/technitium.yml create mode 100644 docker-compose.d/Tools/ariang.yml create mode 100644 docker-compose.d/Tools/monerod.yml create mode 100644 docker-compose.d/Tools/nextcloud-aio.yml create mode 100644 docker-compose.d/Tools/p2pool.yml rename docker-compose.d/Tools/{searxng-stack.yml => searxng.yml} (70%) delete mode 100644 docker-compose.yml create mode 100755 scripts/run-all.sh diff --git a/docker-compose.d/Documentation/bookstack-stack.yml b/docker-compose.d/Documentation/bookstack.yml similarity index 79% rename from docker-compose.d/Documentation/bookstack-stack.yml rename to docker-compose.d/Documentation/bookstack.yml index 60857bf..4dc0704 100644 --- a/docker-compose.d/Documentation/bookstack-stack.yml +++ b/docker-compose.d/Documentation/bookstack.yml @@ -1,6 +1,7 @@ services: bookstack: image: lscr.io/linuxserver/bookstack + container_name: bookstack environment: - PUID=1000 - PGID=1000 @@ -9,32 +10,31 @@ services: - DB_HOST=bookstack_db - DB_PORT=3306 - DB_USER=bookstack - - DB_PASS=/run/secrets/PASS + - DB_PASS=${PASS} - DB_DATABASE=bookstackapp volumes: - bookstack:/config + restart: unless-stopped depends_on: - bookstack_db - secrets: - - PASS networks: - caddy - bookstack - + bookstack_db: image: lscr.io/linuxserver/mariadb + container_name: bookstack_db environment: - PUID=1000 - PGID=1000 - TZ=America/Chicago - - MYSQL_ROOT_PASSWORD=/run/secrets/PASS + - MYSQL_ROOT_PASSWORD=${PASS} - MYSQL_DATABASE=bookstackapp - MYSQL_USER=bookstack - - MYSQL_PASSWORD=/run/secrets/PASS + - MYSQL_PASSWORD=${PASS} volumes: - bookstack_db:/config - secrets: - - PASS + restart: unless-stopped networks: - bookstack @@ -48,9 +48,7 @@ networks: volumes: bookstack: name: bookstack + external: true bookstack_db: name: bookstack_db - -secrets: - PASS: external: true diff --git a/docker-compose.d/Documentation/gitea-stack.yml b/docker-compose.d/Documentation/gitea.yml similarity index 84% rename from docker-compose.d/Documentation/gitea-stack.yml rename to docker-compose.d/Documentation/gitea.yml index 2fd2c97..a9fc9a3 100644 --- a/docker-compose.d/Documentation/gitea-stack.yml +++ b/docker-compose.d/Documentation/gitea.yml @@ -1,5 +1,6 @@ services: gitea: + container_name: gitea image: gitea/gitea:latest environment: - GITEA__service__DISABLE_REGISTRATION=true @@ -9,6 +10,7 @@ services: - gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + restart: unless-stopped networks: - caddy @@ -20,3 +22,4 @@ networks: volumes: gitea: name: gitea + external: true diff --git a/docker-compose.d/Documentation/vaultwarden-stack.yml b/docker-compose.d/Documentation/vaultwarden.yml similarity index 51% rename from docker-compose.d/Documentation/vaultwarden-stack.yml rename to docker-compose.d/Documentation/vaultwarden.yml index 54121c0..9cd3b83 100644 --- a/docker-compose.d/Documentation/vaultwarden-stack.yml +++ b/docker-compose.d/Documentation/vaultwarden.yml @@ -1,17 +1,17 @@ services: vaultwarden: image: vaultwarden/server:latest - environment: - - DOMAIN=https://vault.mintyserver.net - - WEBSOCKET_ENABLED=true - - SIGNUPS_ALLOWED=false - - ADMIN_TOKEN=/run/secrets/PASS + container_name: vaultwarden + restart: unless-stopped + environment: + DOMAIN: "https://vault.mintyserver.net" + WEBSOCKET_ENABLED: true + SIGNUPS_ALLOWED: false + ADMIN_TOKEN: ${PASS} volumes: - vaultwarden:/data - networks: + networks: - caddy - secrets: - - PASS networks: caddy: @@ -21,7 +21,4 @@ networks: volumes: vaultwarden: name: vaultwarden - -secrets: - PASS: external: true diff --git a/docker-compose.d/Media/arr-stack.yml b/docker-compose.d/Media/arr.yml similarity index 81% rename from docker-compose.d/Media/arr-stack.yml rename to docker-compose.d/Media/arr.yml index 84479aa..bd195f6 100644 --- a/docker-compose.d/Media/arr-stack.yml +++ b/docker-compose.d/Media/arr.yml @@ -1,6 +1,7 @@ services: prowlarr: image: lscr.io/linuxserver/prowlarr:latest + container_name: prowlarr environment: - PUID=1000 - PGID=1000 @@ -9,12 +10,14 @@ services: - prowlarr:/config ports: - 9696:9696 + restart: unless-stopped networks: - arr - qbit sonarr: image: lscr.io/linuxserver/sonarr:latest + container_name: sonarr environment: - PUID=1000 - PGID=1000 @@ -24,6 +27,7 @@ services: - /mnt/massdrive/media:/mnt/media ports: - 8989:8989 + restart: unless-stopped networks: - arr - qbit @@ -39,5 +43,7 @@ networks: volumes: prowlarr: name: prowlarr + external: true sonarr: name: sonarr + external: true diff --git a/docker-compose.d/Media/jellyfin-stack.yml b/docker-compose.d/Media/jellyfin.yml similarity index 75% rename from docker-compose.d/Media/jellyfin-stack.yml rename to docker-compose.d/Media/jellyfin.yml index 3d4fd98..22f9322 100644 --- a/docker-compose.d/Media/jellyfin-stack.yml +++ b/docker-compose.d/Media/jellyfin.yml @@ -1,15 +1,19 @@ services: jellyfin: image: lscr.io/linuxserver/jellyfin:latest - devices: + container_name: jellyfin + devices: - /dev/dri:/dev/dri - environment: + environment: - PUID=1000 - PGID=1000 - TZ=America/Chicago volumes: - jellyfin:/config - /mnt/massdrive/media:/data + ports: + - 8096:8096 + restart: unless-stopped networks: - caddy - shoko @@ -25,3 +29,4 @@ networks: volumes: jellyfin: name: jellyfin + external: true diff --git a/docker-compose.d/Media/shoko.yml b/docker-compose.d/Media/shoko.yml new file mode 100644 index 0000000..3da6a59 --- /dev/null +++ b/docker-compose.d/Media/shoko.yml @@ -0,0 +1,27 @@ +services: + shoko: + shm_size: 256m + container_name: shoko + image: shokoanime/server:daily + restart: always + environment: + - "PUID=1000" + - "PGID=1000" + - "TZ=Etc/UTC" + ports: + - "8111:8111" + volumes: + - shoko:/home/shoko/.shoko + - /mnt/massdrive/media:/mnt/media + networks: + - shoko + +networks: + shoko: + name: shoko + external: true + +volumes: + shoko: + name: shoko + external: true diff --git a/docker-compose.d/Networking/caddy.yml b/docker-compose.d/Networking/caddy.yml new file mode 100644 index 0000000..9391ffb --- /dev/null +++ b/docker-compose.d/Networking/caddy.yml @@ -0,0 +1,37 @@ +services: + caddy: + image: caddy:latest + container_name: caddy + restart: unless-stopped + cap_add: + - NET_ADMIN + ports: + - 80:80 + - 443:443 + - 443:443/udp + volumes: + - caddy_set:/etc/caddy + - caddy_srv:/srv + - caddy_data:/data + - caddy_config:/config + networks: + - caddy + +networks: + caddy: + name: caddy + external: true + +volumes: + caddy_config: + name: caddy_config + external: true + caddy_data: + name: caddy_data + external: true + caddy_srv: + name: caddy_srv + external: true + caddy_set: + name: caddy_set + external: true diff --git a/docker-compose.d/Networking/gluetun.yml b/docker-compose.d/Networking/gluetun.yml new file mode 100644 index 0000000..517f312 --- /dev/null +++ b/docker-compose.d/Networking/gluetun.yml @@ -0,0 +1,31 @@ +services: + gluetun: + image: ghcr.io/qdm12/gluetun + cap_add: + - NET_ADMIN + container_name: gluetun + environment: + - VPN_SERVICE_PROVIDER=mullvad + - VPN_TYPE=wireguard + - WIREGUARD_PRIVATE_KEY=${MULLKEY} + - WIREGUARD_ADDRESSES=10.73.138.162/32 + - SERVER_CITIES=Chicago IL + volumes: + - gluetun:/gluetun + ports: + - 8181:8181 + - 6881:6881 + - 6881:6881/udp + restart: unless-stopped + networks: + - mullvad + +networks: + mullvad: + name: mullvad + external: true + +volumes: + gluetun: + name: gluetun + external: true diff --git a/docker-compose.d/Networking/technitium-stack.yml b/docker-compose.d/Networking/technitium-stack.yml deleted file mode 100644 index 5dc8072..0000000 --- a/docker-compose.d/Networking/technitium-stack.yml +++ /dev/null @@ -1,25 +0,0 @@ -services: - technitium: - image: technitium/dns-server:latest - environment: - - DNS_SERVER_DOMAIN=technitium - - DNS_SERVER_ADMIN_PASSWORD=/run/secrets/PASS - volumes: - - technitium:/etc/dns - secrets: - - PASS - networks: - - host - -volumes: - technitium: - name: technitium - -secrets: - PASS: - external: true - -networks: - host: - name: host - external: true diff --git a/docker-compose.d/Networking/technitium.yml b/docker-compose.d/Networking/technitium.yml new file mode 100644 index 0000000..0f2f972 --- /dev/null +++ b/docker-compose.d/Networking/technitium.yml @@ -0,0 +1,17 @@ +services: + technitium: + container_name: technitium + image: technitium/dns-server:latest + network_mode: "host" + environment: + - DNS_SERVER_DOMAIN=technitium + - DNS_SERVER_ADMIN_PASSWORD=${PASS} + volumes: + - technitium:/etc/dns + restart: unless-stopped + +volumes: + technitium: + name: technitium + external: true + diff --git a/docker-compose.d/Tools/ariang.yml b/docker-compose.d/Tools/ariang.yml new file mode 100644 index 0000000..ff28045 --- /dev/null +++ b/docker-compose.d/Tools/ariang.yml @@ -0,0 +1,27 @@ +services: + ariang: + image: hurlenko/aria2-ariang + container_name: aria + restart: unless-stopped + volumes: + - /mnt/nextcloud:/aria2/data + - ariang:/aria2/conf + environment: + - PUID=1000 + - PGID=1000 + - RPC_SECRET=${PASS} + - BASIC_AUTH_USERNAME=poslop + - BASIC_AUTH_PASSWORD=${PASS} + - ARIA2RPCPORT=443 + networks: + - caddy + +volumes: + ariang: + name: ariang + external: true + +networks: + caddy: + name: caddy + external: true diff --git a/docker-compose.d/Tools/monerod.yml b/docker-compose.d/Tools/monerod.yml new file mode 100644 index 0000000..92ffb1c --- /dev/null +++ b/docker-compose.d/Tools/monerod.yml @@ -0,0 +1,27 @@ +services: + monerod: + image: sethsimmons/simple-monerod:latest + restart: unless-stopped + container_name: monerod + volumes: + - bitmonero:/home/monero/.bitmonero:rw + ports: + - 18080:18080 + - 18089:18089 + - 18083:18083 + command: + - "--add-priority-node=p2pmd.xmrvsbeast.com:18080" + - "--out-peers=32" + - "--in-peers=64" + - "--disable-dns-checkpoints" + - "--rpc-restricted-bind-ip=0.0.0.0" + - "--rpc-restricted-bind-port=18089" + - "--no-igd" + - "--enable-dns-blocklist" + - "--prune-blockchain" + - "--zmq-pub=tcp://0.0.0.0:18083" + +volumes: + bitmonero: + name: bitmonero + external: true diff --git a/docker-compose.d/Tools/nextcloud-aio.yml b/docker-compose.d/Tools/nextcloud-aio.yml new file mode 100644 index 0000000..87294f4 --- /dev/null +++ b/docker-compose.d/Tools/nextcloud-aio.yml @@ -0,0 +1,21 @@ +services: + nextcloud: + container_name: nextcloud-aio-mastercontainer + init: true + restart: unless-stopped + image: nextcloud/all-in-one:latest + volumes: + - nextcloud_aio_mastercontainer:/mnt/docker-aio-config + - /var/run/docker.sock:/var/run/docker.sock:ro + ports: + - 8080:8080 + environment: + - APACHE_PORT=11000 + - APACHE_IP_BINDING=0.0.0.0 + - NEXTCLOUD_MOUNT=/mnt/nextcloud/ + - NEXTCLOUD_MEMORY_LIMIT=4096M + +volumes: + nextcloud_aio_mastercontainer: + name: nextcloud_aio_mastercontainer + external: true diff --git a/docker-compose.d/Tools/p2pool.yml b/docker-compose.d/Tools/p2pool.yml new file mode 100644 index 0000000..f110049 --- /dev/null +++ b/docker-compose.d/Tools/p2pool.yml @@ -0,0 +1,23 @@ +services: + p2pool: + image: sethsimmons/p2pool:latest + restart: unless-stopped + container_name: p2pool + tty: true + stdin_open: true + volumes: + - p2pool-data:/home/p2pool + - /dev/hugepages:/dev/hugepages:rw + ports: + - 3333:3333 + - 37889:37889 + command: >- + --wallet "48Whozrwq4jDA6JZ3vJw3Z22VFCCdi4MnLDH5WfHX33w8ehHZ3hRsJC6JBFmgau8BjbXzfL6Um1GdGNfzzbqueDGPhSusji" + --stratum "0.0.0.0:3333" --p2p "0.0.0.0:37889" --rpc-port "18089" + --host "monerod" + --loglevel 1 + +volumes: + p2pool-data: + name: p2pool-data + external: true diff --git a/docker-compose.d/Tools/searxng-stack.yml b/docker-compose.d/Tools/searxng.yml similarity index 70% rename from docker-compose.d/Tools/searxng-stack.yml rename to docker-compose.d/Tools/searxng.yml index 6f15791..b958f47 100644 --- a/docker-compose.d/Tools/searxng-stack.yml +++ b/docker-compose.d/Tools/searxng.yml @@ -1,11 +1,13 @@ services: searxng: image: searxng/searxng:latest - environment: + container_name: searxng + environment: - BASE_URL=https://searxng.mintyserver.net volumes: - searxng:/etc/searxng - networks: + restart: unless-stopped + networks: - caddy networks: @@ -16,3 +18,4 @@ networks: volumes: searxng: name: searxng + external: true diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 0f9044b..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,190 +0,0 @@ -networks: - caddy: - name: caddy - external: true - qbit: - name: qbit - shoko: - name: shoko - external: true - -services: - gluetun: - image: ghcr.io/qdm12/gluetun - cap_add: - - NET_ADMIN - container_name: gluetun - environment: - - VPN_SERVICE_PROVIDER=mullvad - - VPN_TYPE=wireguard - - WIREGUARD_PRIVATE_KEY=${MULLKEY} - - WIREGUARD_ADDRESSES=10.64.21.169/32 - - SERVER_CITIES=Chicago IL - volumes: - - gluetun:/gluetun - ports: - - 8181:8181 - - 6881:6881 - - 6881:6881/udp - restart: unless-stopped - networks: - - qbit - - caddy: - image: caddy:latest - container_name: caddy - restart: unless-stopped - cap_add: - - NET_ADMIN - ports: - - 80:80 - - 443:443 - - 443:443/udp - volumes: - - caddy_set:/etc/caddy - - caddy_srv:/srv - - caddy_data:/data - - caddy_config:/config - networks: - - caddy - - qbittorrent: - image: lscr.io/linuxserver/qbittorrent:latest - container_name: qbittorrent - environment: - - PUID=1000 - - PGID=1000 - - TZ=Etc/UTC - - WEBUI_PORT=8181 - network_mode: "service:gluetun" - volumes: - - qbittorrent:/config - - /mnt/nextcloud:/mnt/files - restart: unless-stopped - depends_on: - gluetun: - condition: service_healthy - - shoko: - shm_size: 256m - container_name: shoko - image: shokoanime/server:daily - restart: always - environment: - - "PUID=1000" - - "PGID=1000" - - "TZ=Etc/UTC" - ports: - - "8111:8111" - volumes: - - shoko:/home/shoko/.shoko - - /mnt/massdrive/media:/mnt/media - networks: - - shoko - - monerod: - image: sethsimmons/simple-monerod:latest - restart: unless-stopped - container_name: monerod - volumes: - - bitmonero:/home/monero/.bitmonero:rw - ports: - - 18080:18080 - - 18089:18089 - - 18083:18083 - command: - - "--add-priority-node=p2pmd.xmrvsbeast.com:18080" - - "--out-peers=32" - - "--in-peers=64" - - "--disable-dns-checkpoints" - - "--rpc-restricted-bind-ip=0.0.0.0" - - "--rpc-restricted-bind-port=18089" - - "--no-igd" - - "--enable-dns-blocklist" - - "--prune-blockchain" - - "--zmq-pub=tcp://0.0.0.0:18083" - - p2pool: - image: sethsimmons/p2pool:latest - restart: unless-stopped - container_name: p2pool - tty: true - stdin_open: true - volumes: - - p2pool-data:/home/p2pool - - /dev/hugepages:/dev/hugepages:rw - ports: - - 3333:3333 - - 37889:37889 - command: >- - --wallet "48Whozrwq4jDA6JZ3vJw3Z22VFCCdi4MnLDH5WfHX33w8ehHZ3hRsJC6JBFmgau8BjbXzfL6Um1GdGNfzzbqueDGPhSusji" - --stratum "0.0.0.0:3333" --p2p "0.0.0.0:37889" --rpc-port "18089" - --host "monerod" - --loglevel 1 - - - ariang: - image: hurlenko/aria2-ariang - container_name: aria - restart: unless-stopped - volumes: - - /mnt/nextcloud:/aria2/data - - ariang:/aria2/conf - environment: - - PUID=1000 - - PGID=1000 - - RPC_SECRET=${PASS} - - BASIC_AUTH_USERNAME=poslop - - BASIC_AUTH_PASSWORD=${PASS} - - ARIA2RPCPORT=443 - networks: - - caddy - - nextcloud: - container_name: nextcloud-aio-mastercontainer - init: true - restart: unless-stopped - image: nextcloud/all-in-one:latest - volumes: - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config - - /var/run/docker.sock:/var/run/docker.sock:ro - ports: - - 8080:8080 - environment: - - APACHE_PORT=11000 - - APACHE_IP_BINDING=0.0.0.0 - - NEXTCLOUD_MOUNT=/mnt/nextcloud/ - - NEXTCLOUD_MEMORY_LIMIT=4096M - - watchtower: - image: containrrr/watchtower - container_name: watchtower - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - -volumes: - caddy_config: - name: caddy_config - caddy_data: - name: caddy_data - caddy_srv: - name: caddy_srv - caddy_set: - name: caddy_set - qbittorrent: - name: qbittorrent - external: true - shoko: - name: shoko - external: true - ariang: - name: ariang - nextcloud_aio_mastercontainer: - name: nextcloud_aio_mastercontainer - bitmonero: - name: bitmonero - p2pool-data: - name: p2pool-data - gluetun: - name: gluetun diff --git a/scripts/run-all.sh b/scripts/run-all.sh new file mode 100755 index 0000000..787bc41 --- /dev/null +++ b/scripts/run-all.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# Define the path to the .env file (root-level) +ENV_FILE="/mnt/docker/.env" + +# Base directory where the service Compose files are located +COMPOSE_DIR="/mnt/docker/docker-compose.d" + +# List of service directories under docker-compose.d +services=( + "Documentation/bookstack.yml" + "Documentation/gitea.yml" + "Documentation/vaultwarden.yml" + "Media/arr.yml" + "Media/jellyfin.yml" + "Media/shoko.yml" + "Networking/gluetun.yml" + "Networking/technitium.yml" + "Networking/caddy.yml" + "Tools/searxng.yml" + "Tools/monerod.yml" + "Tools/p2pool.yml" + "Tools/ariang.yml" + "Tools/nextcloud-aio.yml" +) + +# Start building the docker compose command with multiple -f flags +COMPOSE_COMMAND="docker compose --env-file \"$ENV_FILE\"" + +# Loop through each service and append the -f flag for each compose file +for service in "${services[@]}"; do + COMPOSE_COMMAND+=" -f \"$COMPOSE_DIR/$service\"" +done + +# Add the up command to the final docker compose command +COMPOSE_COMMAND+=" up -d" + +# Execute the composed command +eval $COMPOSE_COMMAND + +echo "All services have been started." From 40bce017b4da0f113b1f7ba4738c75704152c272 Mon Sep 17 00:00:00 2001 From: poslop Date: Tue, 29 Oct 2024 14:59:49 -0500 Subject: [PATCH 10/10] cleaned some compose files --- docker-compose.d/Media/arr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.d/Media/arr.yml b/docker-compose.d/Media/arr.yml index bd195f6..c4d304a 100644 --- a/docker-compose.d/Media/arr.yml +++ b/docker-compose.d/Media/arr.yml @@ -35,7 +35,6 @@ services: networks: arr: name: arr - external: true qbit: name: qbit external: true