up

PnX-SI · Aug 16, 2023 · 36a7a6d · 36a7a6d
1 parent 4f80d08
commit 36a7a6d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,7 +45,6 @@ services:
     image: ${TRAEFIX_IMAGE}
     container_name: ${TRAEFIK_CONTAINER_NAME}
     networks:
-      - default
       - traefik
     command:
       - --providers.docker
@@ -139,8 +138,9 @@ services:
       - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-http.entrypoints=web"
       - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.rule=Host(`${PGADMIN_DOMAIN}`) && PathPrefix(`${PGADMIN_PREFIX}`)"
       - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.entrypoints=websecure"
-      - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.tls=${TRAEFIK_TLS}"
+      - "traefik.http.routers.${PGADMIN_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     logging:
       options:
         tag: ${PGADMIN_CONTAINER_NAME}
@@ -174,8 +174,9 @@ services:
       - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-http.entrypoints=web"
       - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.rule=Host(`${USERSHUB_DOMAIN}`) && PathPrefix(`${USERSHUB_PREFIX}`)"
       - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.entrypoints=websecure"
-      - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.tls=${TRAEFIK_TLS}"
+      - "traefik.http.routers.${USERSHUB_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     healthcheck:
       test: ["CMD", "./docker_healthcheck.sh"]
       interval: 5s
@@ -212,8 +213,9 @@ services:
       - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-http.entrypoints=web"
       - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.rule=Host(`${TAXHUB_DOMAIN}`) && PathPrefix(`${TAXHUB_PREFIX}`)"
       - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.entrypoints=websecure"
-      - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.tls=${TRAEFIK_TLS}"
+      - "traefik.http.routers.${TAXHUB_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     healthcheck:
       test: ["CMD", "./docker_healthcheck.sh"]
       interval: 10s
@@ -259,8 +261,9 @@ services:
       - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-http.entrypoints=web"
       - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.rule=Host(`${GEONATURE_FRONTEND_DOMAIN}`) && PathPrefix(`${GEONATURE_FRONTEND_PREFIX}`)"
       - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.entrypoints=websecure"
-      - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.tls=${TRAEFIK_TLS}"
+      - "traefik.http.routers.${GEONATURE_FRONTEND_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     healthcheck:
       test: ["CMD", "/docker_healthcheck.sh"]
       interval: 1s
@@ -295,7 +298,8 @@ services:
       - "traefik.http.routers.${GEONATURE_BACKEND_CONTAINER_NAME}-https.rule=Host(`${GEONATURE_BACKEND_DOMAIN}`) && PathPrefix(`${GEONATURE_BACKEND_PREFIX}`)"
       - "traefik.http.routers.${GEONATURE_BACKEND_CONTAINER_NAME}-https.entrypoints=websecure"
       - "traefik.http.routers.${GEONATURE_BACKEND_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${GEONATURE_BACKEND_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${GEONATURE_BACKEND_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     healthcheck:
       test: ["CMD", "/docker_healthcheck.sh"]
       interval: ${GEONATURE_BACKEND_HEALTHCHECK_INTERVAL}
@@ -347,7 +351,8 @@ services:
       - "traefik.http.routers.${ATLAS_CONTAINER_NAME}-https.rule=Host(`${ATLAS_DOMAIN}`) && PathPrefix(`${ATLAS_PREFIX}`)"
       - "traefik.http.routers.${ATLAS_CONTAINER_NAME}-https.entrypoints=websecure"
       - "traefik.http.routers.${ATLAS_CONTAINER_NAME}-https.tls==${TRAEFIK_TLS}"
-      - "traefik.http.routers.${ATLAS_CONTAINER_NAME}-https.tls=.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.${ATLAS_CONTAINER_NAME}-https.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.docker.network=${TRAEFIK_NETWORK_NAME}"
     healthcheck:
       test: ["CMD", "./docker_healthcheck.sh"]
       interval: ${ATLAS_HEALTHCHECK_INTERVAL}

diff --git a/overrides/docker-compose.multiple.yml b/overrides/docker-compose.multiple.yml
@@ -6,6 +6,8 @@ services:
       - traefik
 
 networks:
+  default:
+    driver: bridge
   traefik:
     external: true
     name: $TRAEFIK_NETWORK_NAME
diff --git a/sources/GeoNature b/sources/GeoNature