diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9a200a8..39f7ea9 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -4,17 +4,12 @@ services: command: ["redis-server", "--appendonly", "yes"] volumes: - bm_dev_redis_data:/data - networks: - - bm_internal flaresolverr: image: ghcr.io/flaresolverr/flaresolverr:latest environment: LOG_LEVEL: info CAPTCHA_SOLVER: none - networks: - - bm_internal - - coolify labels: - traefik.enable=false restart: unless-stopped @@ -30,9 +25,6 @@ services: CRAWLER_SCHED_FULL_DAY: "0" depends_on: - flaresolverr - networks: - - bm_internal - - coolify labels: - traefik.enable=false restart: unless-stopped @@ -50,9 +42,6 @@ services: NOMINATIM_JITTER: "0.35" GEOCODE_MAX_PER_RUN: "5000" command: ["python", "src/worker.py"] - networks: - - bm_internal - - coolify labels: - traefik.enable=false restart: "no" @@ -65,9 +54,6 @@ services: PGADMIN_CONFIG_SERVER_MODE: "True" volumes: - bm_dev_pgadmin_data:/var/lib/pgadmin - networks: - - bm_internal - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -85,9 +71,6 @@ services: DATABASE_URL: ${DATABASE_URL} BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN} CORS_ORIGINS: ${CORS_ORIGINS:-https://dev.metalfrom.eu} - networks: - - bm_internal - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -102,8 +85,6 @@ services: context: apps/web args: API_BASE: https://dev-api.metalfrom.eu - networks: - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -113,13 +94,6 @@ services: - traefik.http.routers.dev-web.tls.certresolver=letsencrypt - traefik.http.services.dev-web.loadbalancer.server.port=80 -networks: - bm_internal: - driver: bridge - coolify: - external: true - name: coolify - volumes: bm_dev_redis_data: bm_dev_pgadmin_data: diff --git a/docker-compose.yml b/docker-compose.yml index 0669e67..e84f8f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: command: ["redis-server", "--appendonly", "yes"] volumes: - bm_redis_data:/data - networks: - - bm_internal geocoder-worker: build: @@ -20,9 +18,8 @@ services: NOMINATIM_JITTER: "0.35" GEOCODE_MAX_PER_RUN: "5000" command: ["python", "src/worker.py"] - networks: - - bm_internal - - coolify + labels: + - traefik.enable=false restart: unless-stopped pgadmin: @@ -33,9 +30,6 @@ services: PGADMIN_CONFIG_SERVER_MODE: "True" volumes: - pgadmin_data:/var/lib/pgadmin - networks: - - bm_internal - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -53,9 +47,6 @@ services: DATABASE_URL: ${DATABASE_URL} BM_IMPORT_TOKEN: ${BM_IMPORT_TOKEN} CORS_ORIGINS: ${CORS_ORIGINS:-https://metalfrom.eu,https://www.metalfrom.eu} - networks: - - bm_internal - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -68,8 +59,6 @@ services: web: build: context: apps/web - networks: - - coolify labels: - traefik.enable=true - traefik.docker.network=coolify @@ -81,28 +70,6 @@ services: - traefik.http.routers.bm-web.tls.domains[0].sans=www.metalfrom.eu - 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: bm_redis_data: pgadmin_data: - worker_state: