From a90725ce7ea65e2b42099157cb89541811531834 Mon Sep 17 00:00:00 2001
From: 4o1x5 <4o1x5@4o1x5.dev>
Date: Sat, 1 Jun 2024 18:19:55 +0200
Subject: [PATCH] docker-compose: some changes? idk eureka has problems finding
 services

---
 docker-compose.yml                         | 10 ++++++++++
 dummy/src/main/resources/application.yml   |  4 ++--
 gateway/src/main/resources/application.yml |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 70b65dd..84073d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,22 +6,32 @@ services:
   eureka:
     image: git.4o1x5.dev/learningpulse/server/eureka:dev
     restart: always
+    hostname: eureka-server
     networks:
       - learningpulse
 
   dummy:
     image: git.4o1x5.dev/learningpulse/server/dummy:dev
     restart: always
+    depends_on:
+      - eureka
     networks:
       - learningpulse
+    environment:
+      EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eureka-server:8761/eureka
 
   gateway:
     image: git.4o1x5.dev/learningpulse/server/gateway:dev
     restart: always
+    depends_on:
+      - eureka
+      - dummy
     ports:
       - 8181:8181
     networks:
       - learningpulse
+    environment:
+      EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eureka-server:8761/eureka
 
   # TODO once implemented into gateway
   # keycloak:
diff --git a/dummy/src/main/resources/application.yml b/dummy/src/main/resources/application.yml
index 0c21d6c..fa257bf 100644
--- a/dummy/src/main/resources/application.yml
+++ b/dummy/src/main/resources/application.yml
@@ -32,6 +32,6 @@ management:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:8761/eureka
+      #defaultZone: http://localhost:8761/eureka
       # Will only work when docker is used
-      # defaultZone: http://${app.eureka-server}:8761/eureka
+      defaultZone: http://eureka-server:8761/eureka
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index c7acec3..83094d8 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -74,6 +74,6 @@ springdoc:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:8761/eureka
+      #defaultZone: http://localhost:8761/eureka
       # Will only work when docker is used
-      # defaultZone: http://${app.eureka-server}:8761/eureka
+      defaultZone: http://eureka-server:8761/eureka