From ce5c9cb4858990b8721fd0b05effcd3647ae8f5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Rault?= <gwenael@cartoway.com>
Date: Mon, 26 Feb 2024 14:43:54 +0100
Subject: [PATCH] Edit docker-compose links -> networks

---
 .env.template      |  2 +-
 docker-compose.yml | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.env.template b/.env.template
index 83c0e6356..aad55d98f 100644
--- a/.env.template
+++ b/.env.template
@@ -4,7 +4,7 @@ GEOCODER_URL=http://localhost:8081/0.1
 GEOCODER_API_KEY=demo
 ROUTER_URL=http://localhost:8082/0.1
 ROUTER_API_KEY=demo
-OPTIMIZER_URL=http://localhost:8083/0.1
+OPTIMIZER_URL=http://optimizer-server/0.1
 OPTIMIZER_API_KEY=demo
 SENTRY_DSN=http://public:secret@example.com/project-id
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e21de7a9f..7cdca6d75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,9 @@ version: '3.3'
 x-web: &web
   build: .
   image: planner-web:${CARTOWAY_VERSION:-latest}
+  networks:
+    - private-network
+    - public-network
   environment:
     env_file: .env
     RAILS_ENV: ${RAILS_ENV:-production}
@@ -11,21 +14,23 @@ x-web: &web
     GEOCODER_API_KEY: ${GEOCODER_API_KEY:-demo}
     ROUTER_URL: ${ROUTER_URL:-http://localhost:8082/0.1}
     ROUTER_API_KEY: ${ROUTER_API_KEY:-demo}
-    OPTIMIZER_URL: ${OPTIMIZER_URL:-http://localhost:8083/0.1}
+    OPTIMIZER_URL: ${OPTIMIZER_URL:-http://optimizer-server/0.1}
     OPTIMIZER_API_KEY: ${OPTIMIZER_API_KEY:-demo}
-    SENTRY_DSN: ${SENTRY_DSN}
+    # SENTRY_DSN: ${SENTRY_DSN}
     HERE_MAP_APIKEY: ${HERE_MAP_APIKEY}
-  volumes:
-    - ./config/database.yml.docker:/srv/app/config/database.yml
-    - ./docker/uploads:/srv/app/public/uploads
   depends_on:
     - db
     - redis-cache
+  volumes:
+    - ./config/database.yml.docker:/srv/app/config/database.yml
+    - ./docker/uploads:/srv/app/public/uploads
   restart: unless-stopped
 
 services:
   db:
     image: postgres:15
+    networks:
+      - private-network
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
@@ -34,6 +39,8 @@ services:
 
   redis-cache:
     image: redis:${REDIS_VERSION:-7-alpine}
+    networks:
+      - private-network
     restart: unless-stopped
     command: redis-server --save ""
 
@@ -49,3 +56,10 @@ services:
 
 volumes:
   pg_data:
+
+networks:
+  private-network:
+    external: false
+
+  public-network:
+    name: public-network