Merge pull request #35 from mvergez/feat/better-env-files

feat: better .env files
naturalsolutions · Nov 21, 2023 · 9ed7664 · 9ed7664
2 parents b72dc31 + 54e21f5
commit 9ed7664
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/docker/.env.sample b/docker/.env.sample
@@ -1,11 +1,16 @@
+# To activate if production mode has to be activated
+#ENV=production
 PROJECT_NAME=geonature-annotation
 DOMAIN=localhost
-CANONICAL_URL=http://${DOMAIN}:8889
+PROTOCOL=http  # either http or https
+HTTP_HTTPS_PORT=8889  # either 80 or 443
+CANONICAL_URL=${PROTOCOL}://${DOMAIN}:${HTTP_HTTPS_PORT}
 
-# APP
+# Login/password to log in into GeoCam
 APP_USER=admin
 APP_PASSWORD=password
 
+# Database credentials
 DB_USER=dbuser
 DB_PASSWORD=dbpassword
 DB_NAME=annotation
@@ -14,10 +19,9 @@ DB_URL=postgresql://${DB_USER}:${DB_PASSWORD}@${DB_ADDR}/${DB_NAME}
 
 MINIO_ROOT_USER=miniouser
 MINIO_ROOT_PASSWORD=miniopassword
-MINIO_ENTRYPOINT_URL=http://localhost:9000
+MINIO_ENTRYPOINT_URL=${CANONICAL_URL}
 MINIO_BUCKET_NAME=miniobucket
 
-
 IMPORT_VARSUBSTITUTION_ENABLED=true
 KEYCLOAK_REALM_ID=${PROJECT_NAME}
 KEYCLOAK_CLIENT_ID=${PROJECT_NAME}
@@ -37,21 +41,22 @@ KC_DB_URL_DATABASE=${DB_NAME}
 KC_DB_USERNAME=${DB_USER}
 KC_DB_PASSWORD=${DB_PASSWORD}
 KEYCLOAK_FRONTEND_CLIENT_ROOT_URL=${CANONICAL_URL}
-KEYCLOAK_TRAEFIK_RULE='PathPrefix(`/auth`)'
-
-
-FRONTEND_IMAGE=registry.gitlab.com/natural-solutions/geonature/annotation:frontend-dev
-REACT_APP_API_PATH=http://localhost:8889/api/v1
 
 API_IMAGE=registry.gitlab.com/natural-solutions/geonature/annotation:api-dev
 API_ROOT_PATH=/api/v1
 
-TRAEFIK_IMAGE=traefik:v2.6
-TRAEFIK_PORT=8889
-TRAEFIK_DASHBOARD_PORT=8890
-TRAEFIK_ROUTER_RULE_API=PathPrefix(`${API_ROOT_PATH}`)
-TRAEFIK_ROUTER_RULE_KEYCLOAK=PathPrefix(`${KC_HTTP_RELATIVE_PATH}`)
-TRAEFIK_ROUTER_RULE_FRONTEND=PathPrefix(`/`)
+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}`)
+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:
@@ -127,7 +128,7 @@ services:
         condition: service_healthy
     labels:
       - traefik.enable=true
-      - traefik.http.routers.keycloak.rule=${KEYCLOAK_TRAEFIK_RULE-PathPrefix(`/auth`)}
+      - traefik.http.routers.keycloak.rule=${TRAEFIK_ROUTER_RULE_KEYCLOAK-PathPrefix(`/auth`)}
       - traefik.http.routers.keycloak.entrypoints=web
 
   minio:
@@ -141,6 +142,9 @@ services:
       timeout: 20s      
       retries: 3
     command: server --console-address :9001 /data
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.minio.rule=${TRAEFIK_ROUTER_RULE_MINIO-PathPrefix(`/miniobucket`)}
 
 volumes:
   db_data: