fix: make taxapi work: add traefik labels

And reorganised .env.sample
naturalsolutions · Nov 21, 2023 · 54e21f5 · 54e21f5
1 parent 8eb92f0
commit 54e21f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docker/.env.sample b/docker/.env.sample
@@ -48,13 +48,15 @@ API_ROOT_PATH=/api/v1
 REACT_APP_API_PATH=${CANONICAL_URL}${API_ROOT_PATH}
 FRONTEND_IMAGE=registry.gitlab.com/natural-solutions/geonature/annotation:frontend-dev
 
+TAXAPI_IMAGE=registry.gitlab.com/natural-solutions/geonature/taxapi:taxapi-latest
+TAXAPI_TAXREF_FILE="TAXREF_v16_2022.zip"
+TAXAPI_ROOT_PATH=/taxapi
+
 TRAEFIK_IMAGE=traefik:v2.6
 TRAEFIK_PORT=${HTTP_HTTPS_PORT}
 TRAEFIK_DASHBOARD_PORT=8890
 TRAEFIK_ROUTER_RULE_API=HOST(`${DOMAIN}`) && PathPrefix(`${API_ROOT_PATH}`)
 TRAEFIK_ROUTER_RULE_KEYCLOAK=HOST(`${DOMAIN}`) && PathPrefix(`${KC_HTTP_RELATIVE_PATH}`)
 TRAEFIK_ROUTER_RULE_FRONTEND=HOST(`${DOMAIN}`) && PathPrefix(`/`)
 TRAEFIK_ROUTER_RULE_MINIO=Host(`${DOMAIN}`) && PathPrefix(`/${MINIO_BUCKET_NAME}`)
-
-TAXAPI_IMAGE=registry.gitlab.com/natural-solutions/geonature/taxapi:taxapi-latest
-TAXAPI_TAXREF_FILE="TAXREF_v16_2022.zip"
+TRAEFIK_ROUTER_RULE_TAXAPI=HOST(`${DOMAIN}`) && PathPrefix(`${TAXAPI_ROOT_PATH}`)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -59,8 +59,9 @@ services:
     image: ${TAXAPI_IMAGE-registry.gitlab.com/natural-solutions/geonature/taxapi:taxapi-latest}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.taxapi.rule=PathPrefix(`/taxapi/V1`)
+      - traefik.http.routers.taxapi.rule=${TRAEFIK_ROUTER_RULE_TAXAPI-PathPrefix(`/taxapi`)}
       - traefik.http.routers.taxapi.entrypoints=web
+      - traefik.http.middlewares.add-foo.addprefix.prefix=${TAXAPI_ROOT_PATH-/taxapi}
     environment:
       - TAXREF_FILE=${TAXAPI_TAXREF_FILE-TAXREF_v16_2022.zip}
     healthcheck: