Update environment variables and configurations

production.yml

@@ -2,6 +2,8 @@ version: '3.7'
 
 x-environment: &default-environment
   LOG_LEVEL: "DEBUG"
+  LOG_PATH: "./logs"
+  ACME_PATH: "./acme.json"
   DASHBOARD_USER: ${DASHBOARD_USER}
   DASHBOARD_PASSWORD: ${DASHBOARD_PASSWORD}
   FIN_LOCATION: "/fin"
@@ -9,9 +11,6 @@ x-environment: &default-environment
   BAI_LOCATION: "/bai"
   STREAMLIT_BAI_SERVER_PORT: "8502"
 
-volumes:
-  production_traefik: {}
-
 services:
   osrm-backend:
     environment:
@@ -28,7 +27,10 @@ services:
     container_name: osrm_backend
     restart: always
     ports:
-      - ${OSRM_PORT}:${OSRM_PORT}
+      - ${OSRM_PORT:-5000}:${OSRM_PORT:-5000}
+    networks:
+      - net
+      - default
 
   streamlit-bai:
     environment:
@@ -39,6 +41,9 @@ services:
     expose:
       - ${STREAMLIT_BAI_SERVER_PORT}
     command: streamlit run --server.port=$STREAMLIT_BAI_SERVER_PORT --server.address=0.0.0.0 --server.baseUrlPath=$BAI_LOCATION src/app.py
+    networks:
+      - net
+      - default
 
   streamlit-fin:
     environment:
@@ -51,6 +56,9 @@ services:
     restart: always
     expose:
       - ${STREAMLIT_FIN_SERVER_PORT}
+    networks:
+      - net
+      - default
     command: streamlit run --server.port=$STREAMLIT_FIN_SERVER_PORT --server.address=0.0.0.0 --server.baseUrlPath=$FIN_LOCATION src/app.py
 
   traefik:
@@ -60,9 +68,20 @@ services:
       context: .
       dockerfile: ./compose/traefik/Dockerfile
     image: traefik_production
+    container_name: traefik
+    retart: always
     volumes:
-      - production_traefik:/etc/traefik/acme:z
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - "${LOG_PATH:-./logs}:/logs"
+      - "${ACME_PATH:-./acme.json}:/etc/traefik/acme/acme.json"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    networks:
+      - net
+      - default
     ports:
-      - "0.0.0.0:80:80"
-      - "0.0.0.0:443:443"
+      - "80:80"
+      - "443:443"
+
+networks:
+  net:
+    external: true
+    name: ${NETWORK:-web}