Remove host rules in favour of defaults

SciCatProject · Apr 23, 2024 · d271c66 · d271c66
1 parent 0b219b5
commit d271c66
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/services/backendv3/docker-compose.yaml b/services/backendv3/docker-compose.yaml
@@ -15,8 +15,6 @@ services:
       - ./config/datasources.json:/home/node/app/server/datasources.json
       - ./config/providers.json:/home/node/app/server/providers.json
       - ./config/component-config.local.json:/home/node/app/server/component-config.local.json
-    labels:
-      - traefik.http.routers.backend.rule=Host(`backend.localhost`)
     healthcheck:
       test: wget --spider 'http://127.0.0.1:3000/'
       start_period: 5s

diff --git a/services/backendv4/docker-compose.yaml b/services/backendv4/docker-compose.yaml
@@ -13,8 +13,6 @@ services:
       - ./config/functionalAccounts.json:/home/node/app/functionalAccounts.json
     env_file:
       - ./config/.env
-    labels:
-      - traefik.http.routers.backend.rule=Host(`backend.localhost`)
     healthcheck:
       test: wget --spider -Y off 'http://127.0.0.1:3000/api/v3/health'
       start_period: 5s

diff --git a/services/jupyter/docker-compose.yaml b/services/jupyter/docker-compose.yaml
@@ -5,7 +5,6 @@ services:
       backend:
         condition: service_healthy
     labels:
-      - traefik.http.routers.jupyter.rule=Host(`jupyter.localhost`)
       - traefik.http.services.jupyter.loadbalancer.server.port=8888
     volumes:
       - ./config/notebooks:/home/jovyan/notebooks

diff --git a/services/proxy/README.md b/services/proxy/README.md
@@ -6,7 +6,7 @@ The proxy acts as a reverse proxy to the SciCat Live containers.
 
 ### [.env file](./config/.env)
 
-It sets proxy options which are rarely changed, for example, the default configuration with the docker network.
+It sets proxy options which are rarely changed, for example, the default configuration with the docker network and the default host rule.
 
 ### [.tls.env file](./config/.tls.env)
 

diff --git a/services/proxy/config/.env b/services/proxy/config/.env
@@ -1,6 +1,10 @@
 TRAEFIK_API_INSECURE=true
+
 TRAEFIK_PROVIDERS_DOCKER=true
-TRAEFIK_ENTRYPOINTS_WEB_ADDRESS=:80
+TRAEFIK_PROVIDERS_DOCKER_CONSTRAINTS=Label(`com.docker.compose.project`, `${COMPOSE_PROJECT_NAME}`)
+TRAEFIK_PROVIDERS_DOCKER_DEFAULTRULE=Host(`{{ normalize .Name | replace "-${COMPOSE_PROJECT_NAME}" ".localhost" }}`)
 
+TRAEFIK_ENTRYPOINTS_WEB_ADDRESS=:80
 TRAEFIK_ENTRYPOINTS_WEBSECURE_ADDRESS=:443
+
 TRAEFIK_CERTIFICATESRESOLVERS_LERESOLVER_ACME_STORAGE=/letsencrypt/acme.json
diff --git a/services/rabbitmq/docker-compose.yaml b/services/rabbitmq/docker-compose.yaml
@@ -2,7 +2,6 @@ services:
   rabbitmq:
     image: rabbitmq:3.13-management-alpine
     labels:
-      - traefik.http.routers.rabbitmq.rule=Host(`rabbitmq.localhost`)
       - traefik.http.services.rabbitmq.loadbalancer.server.port=15672
     volumes:
       - rabbitmq_data:/bitnami

diff --git a/services/searchapi/docker-compose.yaml b/services/searchapi/docker-compose.yaml
@@ -3,7 +3,5 @@ services:
     image: ghcr.io/scicatproject/panosc-search-api:latest
     depends_on:
       - backend
-    labels:
-      - traefik.http.routers.searchapi.rule=Host(`searchapi.localhost`)
     env_file:
       - ./config/.env