From 601ec06611147416e278a86b9e1cbc7f6f9e200a Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Tue, 8 Jul 2025 16:27:43 +0530 Subject: [PATCH 1/3] Add network --- adminer/docker-compose.yml | 6 +++++ caddy-cloudflare-crowdsec/docker-compose.yml | 22 ++++++++----------- .../docker-compose.yml | 10 ++++----- caddy-cloudflare-ddns/docker-compose.yml | 14 ++++-------- caddy-cloudflare/docker-compose.yml | 14 ++++-------- caddy-crowdsec/docker-compose.yml | 22 ++++++++----------- forgejo/docker-compose.yml | 6 +++++ gitea-mirror/docker-compose.yml | 6 +++++ gitea/docker-compose-mariadb.yml | 11 ++++++++++ gitea/docker-compose.yml | 11 ++++++++++ 10 files changed, 71 insertions(+), 51 deletions(-) diff --git a/adminer/docker-compose.yml b/adminer/docker-compose.yml index 95dd8db..3b20808 100644 --- a/adminer/docker-compose.yml +++ b/adminer/docker-compose.yml @@ -4,4 +4,10 @@ services: container_name: adminer ports: - ${PORT}:8080 + networks: + - backend restart: unless-stopped + +networks: + backend: + external: true \ No newline at end of file diff --git a/caddy-cloudflare-crowdsec/docker-compose.yml b/caddy-cloudflare-crowdsec/docker-compose.yml index fc4cff2..5cd3acb 100644 --- a/caddy-cloudflare-crowdsec/docker-compose.yml +++ b/caddy-cloudflare-crowdsec/docker-compose.yml @@ -2,9 +2,6 @@ services: crowdsec: image: ghcr.io/crowdsecurity/crowdsec:v1.6.9 container_name: crowdsec - networks: - proxy: - ipv4_address: 172.30.0.3 environment: - BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY} - GID=${GID} @@ -14,6 +11,8 @@ services: - ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/ - ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/ - ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"] @@ -30,9 +29,6 @@ services: condition: service_healthy cap_add: - NET_ADMIN - networks: - proxy: - ipv4_address: 172.30.0.2 environment: - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN} - CROWDSEC_API_KEY=${CROWDSEC_API_KEY} @@ -46,13 +42,13 @@ services: - ${HTTP_PORT}:80 - ${HTTPS_PORT}:443 - ${HTTPS_PORT}:443/udp + networks: + - frontend + - backend restart: unless-stopped networks: - proxy: - name: proxy - driver: bridge - ipam: - config: - - subnet: 172.30.0.0/16 - gateway: 172.30.0.1 + frontend: + external: true + backend: + external: true diff --git a/caddy-cloudflare-ddns-crowdsec/docker-compose.yml b/caddy-cloudflare-ddns-crowdsec/docker-compose.yml index afe66b9..3f75341 100644 --- a/caddy-cloudflare-ddns-crowdsec/docker-compose.yml +++ b/caddy-cloudflare-ddns-crowdsec/docker-compose.yml @@ -2,8 +2,6 @@ services: crowdsec: image: ghcr.io/crowdsecurity/crowdsec:v1.6.9 container_name: crowdsec - networks: - - backend environment: - BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY} - GID=${GID} @@ -13,6 +11,8 @@ services: - ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/ - ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/ - ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"] @@ -29,9 +29,6 @@ services: condition: service_healthy cap_add: - NET_ADMIN - networks: - - frontend - - backend environment: - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN} - CROWDSEC_API_KEY=${CROWDSEC_API_KEY} @@ -45,6 +42,9 @@ services: - ${HTTP_PORT}:80 - ${HTTPS_PORT}:443 - ${HTTPS_PORT}:443/udp + networks: + - frontend + - backend restart: unless-stopped networks: diff --git a/caddy-cloudflare-ddns/docker-compose.yml b/caddy-cloudflare-ddns/docker-compose.yml index 14bc26d..e956a26 100644 --- a/caddy-cloudflare-ddns/docker-compose.yml +++ b/caddy-cloudflare-ddns/docker-compose.yml @@ -4,9 +4,6 @@ services: container_name: caddy cap_add: - NET_ADMIN - networks: - proxy: - ipv4_address: 172.30.0.2 environment: - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN} volumes: @@ -19,13 +16,10 @@ services: - ${HTTP_PORT}:80 - ${HTTPS_PORT}:443 - ${HTTPS_PORT}:443/udp + networks: + - frontend restart: unless-stopped networks: - proxy: - name: proxy - driver: bridge - ipam: - config: - - subnet: 172.30.0.0/16 - gateway: 172.30.0.1 + frontend: + external: true diff --git a/caddy-cloudflare/docker-compose.yml b/caddy-cloudflare/docker-compose.yml index 95295d5..73c3c32 100644 --- a/caddy-cloudflare/docker-compose.yml +++ b/caddy-cloudflare/docker-compose.yml @@ -4,9 +4,6 @@ services: container_name: caddy cap_add: - NET_ADMIN - networks: - proxy: - ipv4_address: 172.30.0.2 environment: - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN} volumes: @@ -19,13 +16,10 @@ services: - ${HTTP_PORT}:80 - ${HTTPS_PORT}:443 - ${HTTPS_PORT}:443/udp + networks: + - frontend restart: unless-stopped networks: - proxy: - name: proxy - driver: bridge - ipam: - config: - - subnet: 172.30.0.0/16 - gateway: 172.30.0.1 + frontend: + external: true diff --git a/caddy-crowdsec/docker-compose.yml b/caddy-crowdsec/docker-compose.yml index 18d0a03..8a083f1 100644 --- a/caddy-crowdsec/docker-compose.yml +++ b/caddy-crowdsec/docker-compose.yml @@ -2,9 +2,6 @@ services: crowdsec: image: ghcr.io/crowdsecurity/crowdsec:v1.6.9 container_name: crowdsec - networks: - proxy: - ipv4_address: 172.30.0.3 environment: - BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY} - GID=${GID} @@ -14,6 +11,8 @@ services: - ${APPDATA_PATH}/caddy/crowdsec-db:/var/lib/crowdsec/data/ - ${APPDATA_PATH}/caddy/crowdsec-config:/etc/crowdsec/ - ${APPDATA_PATH}/caddy/caddy-logs:/var/log/caddy:ro + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider --quiet --tries=1 --timeout=5 http://localhost:8080/health > /dev/null 2>&1 || exit 1"] @@ -30,9 +29,6 @@ services: condition: service_healthy cap_add: - NET_ADMIN - networks: - proxy: - ipv4_address: 172.30.0.2 environment: - CROWDSEC_API_KEY=${CROWDSEC_API_KEY} volumes: @@ -45,13 +41,13 @@ services: - ${HTTP_PORT}:80 - ${HTTPS_PORT}:443 - ${HTTPS_PORT}:443/udp + networks: + - frontend + - backend restart: unless-stopped networks: - proxy: - name: proxy - driver: bridge - ipam: - config: - - subnet: 172.30.0.0/16 - gateway: 172.30.0.1 + frontend: + external: true + backend: + external: true diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml index 4a69c1e..6c02297 100644 --- a/forgejo/docker-compose.yml +++ b/forgejo/docker-compose.yml @@ -10,4 +10,10 @@ services: - /etc/localtime:/etc/localtime:ro ports: - ${SERVER_PORT}:3000 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true \ No newline at end of file diff --git a/gitea-mirror/docker-compose.yml b/gitea-mirror/docker-compose.yml index 221d53f..b21eedf 100644 --- a/gitea-mirror/docker-compose.yml +++ b/gitea-mirror/docker-compose.yml @@ -13,6 +13,8 @@ services: - ${APPDATA_PATH}/gitea-mirror/data:/app/data ports: - ${PORT}:4321 + networks: + - internal restart: unless-stopped healthcheck: test: ["CMD", "wget", "--no-verbose", "--tries=3", "--spider", "http://localhost:4321/api/health"] @@ -20,3 +22,7 @@ services: timeout: 10s retries: 5 start_period: 15s + +networks: + internal: + external: true diff --git a/gitea/docker-compose-mariadb.yml b/gitea/docker-compose-mariadb.yml index dd8ad82..8485018 100644 --- a/gitea/docker-compose-mariadb.yml +++ b/gitea/docker-compose-mariadb.yml @@ -12,6 +12,8 @@ services: - ${APPDATA_PATH}/gitea/db:/var/lib/mysql ports: - ${DB_PORT}:3306 + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] @@ -41,4 +43,13 @@ services: ports: - ${SERVER_PORT}:3000 - ${SSH_PORT}:22 + networks: + - frontend + - backend restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: true diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index b9194c3..fb4d51e 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -10,6 +10,8 @@ services: - ${APPDATA_PATH}/gitea/db:/var/lib/postgresql/data ports: - ${DB_PORT}:5432 + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"] @@ -39,4 +41,13 @@ services: ports: - ${SERVER_PORT}:3000 - ${SSH_PORT}:22 + networks: + - frontend + - backend restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: true -- 2.49.1 From e7fe411daf4034b93638343ab22328a9e13b5b9c Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Tue, 8 Jul 2025 16:29:00 +0530 Subject: [PATCH 2/3] Update network for gotify --- gotify/docker-compose.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gotify/docker-compose.yml b/gotify/docker-compose.yml index 3702f10..a9c33d6 100644 --- a/gotify/docker-compose.yml +++ b/gotify/docker-compose.yml @@ -8,5 +8,11 @@ services: volumes: - ${APPDATA_PATH}/gotify/config:/app/data ports: - - "${PORT}:80" + - ${PORT}:80 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true -- 2.49.1 From 34ded33aebbdb83b9e6a48bb5a3df0bc4398c5bd Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Tue, 8 Jul 2025 16:37:23 +0530 Subject: [PATCH 3/3] Add network v2 --- adminer/docker-compose.yml | 2 +- healthchecks/docker-compose.yml | 10 ++++++++-- opengist/docker-compose-mariadb.yml | 11 +++++++++++ opengist/docker-compose.yml | 11 +++++++++++ pingvin-share/docker-compose.yml | 8 +++++++- radicale/docker-compose.yml | 6 ++++++ stirling-pdf/docker-compose.yml | 6 ++++-- syncyomi/docker-compose.yml | 8 +++++++- uptime-kuma/docker-compose.yml | 8 +++++++- vaultwarden/docker-compose.yml | 11 +++++++++++ 10 files changed, 73 insertions(+), 8 deletions(-) diff --git a/adminer/docker-compose.yml b/adminer/docker-compose.yml index 3b20808..9d115ac 100644 --- a/adminer/docker-compose.yml +++ b/adminer/docker-compose.yml @@ -10,4 +10,4 @@ services: networks: backend: - external: true \ No newline at end of file + external: true diff --git a/healthchecks/docker-compose.yml b/healthchecks/docker-compose.yml index 4ed8c7d..c6e21f0 100644 --- a/healthchecks/docker-compose.yml +++ b/healthchecks/docker-compose.yml @@ -28,6 +28,12 @@ services: volumes: - ${APPDATA_PATH}/healthchecks/config:/config ports: - - "${PORT}:8000" - - "${SMTP_PORT}:2525" + - ${PORT}:8000 + - ${SMTP_PORT}:2525 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true diff --git a/opengist/docker-compose-mariadb.yml b/opengist/docker-compose-mariadb.yml index 0e3cf21..ea4f2b7 100644 --- a/opengist/docker-compose-mariadb.yml +++ b/opengist/docker-compose-mariadb.yml @@ -12,6 +12,8 @@ services: - ${APPDATA_PATH}/opengist/db:/var/lib/mysql ports: - ${DB_PORT}:3306 + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"] @@ -44,4 +46,13 @@ services: - ${APPDATA_PATH}/opengist/data:/opengist ports: - ${SERVER_PORT}:6157 + networks: + - frontend + - backend restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: true diff --git a/opengist/docker-compose.yml b/opengist/docker-compose.yml index 729e5b0..1ab43b5 100644 --- a/opengist/docker-compose.yml +++ b/opengist/docker-compose.yml @@ -10,6 +10,8 @@ services: - ${APPDATA_PATH}/opengist/db:/var/lib/postgresql/data ports: - ${DB_PORT}:5432 + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"] @@ -42,4 +44,13 @@ services: - ${APPDATA_PATH}/opengist/data:/opengist ports: - ${SERVER_PORT}:6157 + networks: + - frontend + - backend restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: true diff --git a/pingvin-share/docker-compose.yml b/pingvin-share/docker-compose.yml index 875ce0b..5af0f25 100644 --- a/pingvin-share/docker-compose.yml +++ b/pingvin-share/docker-compose.yml @@ -9,5 +9,11 @@ services: - ${APPDATA_PATH}/pingvin-share/images:/opt/app/frontend/public/img - ${DATA_PATH}:/opt/app/backend/data ports: - - "${PORT}:3000" + - ${PORT}:3000 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true diff --git a/radicale/docker-compose.yml b/radicale/docker-compose.yml index a410690..03c0a18 100644 --- a/radicale/docker-compose.yml +++ b/radicale/docker-compose.yml @@ -23,8 +23,14 @@ services: - ${APPDATA_PATH}/radicale/config:/config:ro ports: - ${PORT}:5232 + networks: + - frontend restart: unless-stopped healthcheck: test: curl -f http://127.0.0.1:5232 || exit 1 interval: 30s retries: 3 + +networks: + frontend: + external: true diff --git a/stirling-pdf/docker-compose.yml b/stirling-pdf/docker-compose.yml index 04648f3..32295b9 100644 --- a/stirling-pdf/docker-compose.yml +++ b/stirling-pdf/docker-compose.yml @@ -6,12 +6,14 @@ services: - DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY} - SECURITY_ENABLELOGIN=${SECURITY_ENABLELOGIN} - LANGS=${LANGS} - ports: - - "${PORT}:8080" volumes: - ${APPDATA_DATA}/stirling-pdf/training_data:/usr/share/tessdata - ${APPDATA_DATA}/stirling-pdf/config:/configs - ${APPDATA_DATA}/stirling-pdf/custom_files:/customFiles/ - ${APPDATA_DATA}/stirling-pdf/logs:/logs/ - ${APPDATA_DATA}/stirling-pdf/pipeline:/pipeline/ + ports: + - ${PORT}:8080 + networks: + - frontend restart: unless-stopped diff --git a/syncyomi/docker-compose.yml b/syncyomi/docker-compose.yml index 51b06ec..635bfad 100644 --- a/syncyomi/docker-compose.yml +++ b/syncyomi/docker-compose.yml @@ -8,5 +8,11 @@ services: - ${APPDATA_PATH}/syncyomi/config:/config - ${APPDATA_PATH}/syncyomi/log:/log ports: - - "${PORT}:8282" + - ${PORT}:8282 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml index 280f9f0..113d549 100644 --- a/uptime-kuma/docker-compose.yml +++ b/uptime-kuma/docker-compose.yml @@ -5,5 +5,11 @@ services: volumes: - ${APPDATA_PATH}/uptime-kuma/config:/app/data ports: - - "${PORT}:3001" + - ${PORT}:3001 + networks: + - frontend restart: unless-stopped + +networks: + frontend: + external: true diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 0b6bebd..62571fc 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -10,6 +10,8 @@ services: - ${APPDATA_PATH}/vaultwarden/db:/var/lib/postgresql/data ports: - ${DB_PORT}:5432 + networks: + - backend restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"] @@ -38,4 +40,13 @@ services: - ${APPDATA_PATH}/vaultwarden/data:/data/ ports: - ${SERVER_PORT}:80 + networks: + - frontend + - backend restart: unless-stopped + +networks: + frontend: + external: true + backend: + external: true -- 2.49.1