refactor: supprimer toutes les déclarations réseau custom des compose files
Coolify gère le réseau Docker de manière autonome : - Crée un réseau projet UUID pour la communication inter-services - Connecte automatiquement les services avec labels Traefik (même enable=false) au vrai réseau coolify via docker network connect après le démarrage Déclarer coolify: external: true dans le compose causait un bug Coolify 4.1.2 qui strippait la config en coolify: null → créait aec2c803..._coolify au lieu du vrai réseau coolify. Suppression complète de bm_internal et coolify des deux compose files. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
70dd610aa2
commit
777d95fc79
2 changed files with 2 additions and 61 deletions
|
|
@ -4,17 +4,12 @@ services:
|
||||||
command: ["redis-server", "--appendonly", "yes"]
|
command: ["redis-server", "--appendonly", "yes"]
|
||||||
volumes:
|
volumes:
|
||||||
- bm_dev_redis_data:/data
|
- bm_dev_redis_data:/data
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
|
|
||||||
flaresolverr:
|
flaresolverr:
|
||||||
image: ghcr.io/flaresolverr/flaresolverr:latest
|
image: ghcr.io/flaresolverr/flaresolverr:latest
|
||||||
environment:
|
environment:
|
||||||
LOG_LEVEL: info
|
LOG_LEVEL: info
|
||||||
CAPTCHA_SOLVER: none
|
CAPTCHA_SOLVER: none
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=false
|
- traefik.enable=false
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -30,9 +25,6 @@ services:
|
||||||
CRAWLER_SCHED_FULL_DAY: "0"
|
CRAWLER_SCHED_FULL_DAY: "0"
|
||||||
depends_on:
|
depends_on:
|
||||||
- flaresolverr
|
- flaresolverr
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=false
|
- traefik.enable=false
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -50,9 +42,6 @@ services:
|
||||||
NOMINATIM_JITTER: "0.35"
|
NOMINATIM_JITTER: "0.35"
|
||||||
GEOCODE_MAX_PER_RUN: "5000"
|
GEOCODE_MAX_PER_RUN: "5000"
|
||||||
command: ["python", "src/worker.py"]
|
command: ["python", "src/worker.py"]
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=false
|
- traefik.enable=false
|
||||||
restart: "no"
|
restart: "no"
|
||||||
|
|
@ -65,9 +54,6 @@ services:
|
||||||
PGADMIN_CONFIG_SERVER_MODE: "True"
|
PGADMIN_CONFIG_SERVER_MODE: "True"
|
||||||
volumes:
|
volumes:
|
||||||
- bm_dev_pgadmin_data:/var/lib/pgadmin
|
- bm_dev_pgadmin_data:/var/lib/pgadmin
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -85,9 +71,6 @@ services:
|
||||||
DATABASE_URL: ${DATABASE_URL}
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN}
|
BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN}
|
||||||
CORS_ORIGINS: ${CORS_ORIGINS:-https://dev.metalfrom.eu}
|
CORS_ORIGINS: ${CORS_ORIGINS:-https://dev.metalfrom.eu}
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -102,8 +85,6 @@ services:
|
||||||
context: apps/web
|
context: apps/web
|
||||||
args:
|
args:
|
||||||
API_BASE: https://dev-api.metalfrom.eu
|
API_BASE: https://dev-api.metalfrom.eu
|
||||||
networks:
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -113,13 +94,6 @@ services:
|
||||||
- traefik.http.routers.dev-web.tls.certresolver=letsencrypt
|
- traefik.http.routers.dev-web.tls.certresolver=letsencrypt
|
||||||
- traefik.http.services.dev-web.loadbalancer.server.port=80
|
- traefik.http.services.dev-web.loadbalancer.server.port=80
|
||||||
|
|
||||||
networks:
|
|
||||||
bm_internal:
|
|
||||||
driver: bridge
|
|
||||||
coolify:
|
|
||||||
external: true
|
|
||||||
name: coolify
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
bm_dev_redis_data:
|
bm_dev_redis_data:
|
||||||
bm_dev_pgadmin_data:
|
bm_dev_pgadmin_data:
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@ services:
|
||||||
command: ["redis-server", "--appendonly", "yes"]
|
command: ["redis-server", "--appendonly", "yes"]
|
||||||
volumes:
|
volumes:
|
||||||
- bm_redis_data:/data
|
- bm_redis_data:/data
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
|
|
||||||
geocoder-worker:
|
geocoder-worker:
|
||||||
build:
|
build:
|
||||||
|
|
@ -20,9 +18,8 @@ services:
|
||||||
NOMINATIM_JITTER: "0.35"
|
NOMINATIM_JITTER: "0.35"
|
||||||
GEOCODE_MAX_PER_RUN: "5000"
|
GEOCODE_MAX_PER_RUN: "5000"
|
||||||
command: ["python", "src/worker.py"]
|
command: ["python", "src/worker.py"]
|
||||||
networks:
|
labels:
|
||||||
- bm_internal
|
- traefik.enable=false
|
||||||
- coolify
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
pgadmin:
|
pgadmin:
|
||||||
|
|
@ -33,9 +30,6 @@ services:
|
||||||
PGADMIN_CONFIG_SERVER_MODE: "True"
|
PGADMIN_CONFIG_SERVER_MODE: "True"
|
||||||
volumes:
|
volumes:
|
||||||
- pgadmin_data:/var/lib/pgadmin
|
- pgadmin_data:/var/lib/pgadmin
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -53,9 +47,6 @@ services:
|
||||||
DATABASE_URL: ${DATABASE_URL}
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN}
|
BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN}
|
||||||
CORS_ORIGINS: ${CORS_ORIGINS:-https://metalfrom.eu,https://www.metalfrom.eu}
|
CORS_ORIGINS: ${CORS_ORIGINS:-https://metalfrom.eu,https://www.metalfrom.eu}
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -68,8 +59,6 @@ services:
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: apps/web
|
context: apps/web
|
||||||
networks:
|
|
||||||
- coolify
|
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=coolify
|
- traefik.docker.network=coolify
|
||||||
|
|
@ -81,28 +70,6 @@ services:
|
||||||
- traefik.http.routers.bm-web.tls.domains[0].sans=www.metalfrom.eu
|
- traefik.http.routers.bm-web.tls.domains[0].sans=www.metalfrom.eu
|
||||||
- traefik.http.services.bm-web.loadbalancer.server.port=80
|
- traefik.http.services.bm-web.loadbalancer.server.port=80
|
||||||
|
|
||||||
worker:
|
|
||||||
build:
|
|
||||||
context: apps/worker
|
|
||||||
environment:
|
|
||||||
DB_DSN: ${DATABASE_URL}
|
|
||||||
MA_LIST_URL: https://www.metal-archives.com/lists/FR
|
|
||||||
MA_STATE_PATH: /app/ma_state.json
|
|
||||||
volumes:
|
|
||||||
- worker_state:/app
|
|
||||||
networks:
|
|
||||||
- bm_internal
|
|
||||||
- coolify
|
|
||||||
restart: "no"
|
|
||||||
|
|
||||||
networks:
|
|
||||||
bm_internal:
|
|
||||||
driver: bridge
|
|
||||||
coolify:
|
|
||||||
external: true
|
|
||||||
name: coolify
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
bm_redis_data:
|
bm_redis_data:
|
||||||
pgadmin_data:
|
pgadmin_data:
|
||||||
worker_state:
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue