docker-compose.yml

@@ -1,5 +1,3 @@
-
-
 version: "3"
 # https://scribe.rip/@kadampritesh46/microservices-part-4-dockerization-and-beyond-55693a2419e7
 networks:
@@ -14,7 +12,10 @@ services:
     networks:
       - learningpulse
     environment:
-      - SPRING_PROFILES_ACTIVE=docker
+      - spring.application.name=eureka-server
+      - eureka.client.registerWithEureka=false
+      - eureka.client.fetchRegistry=false
+      - eureka.server.waitTimeInMsWhenSyncEmpty=0
 
   # to test
   # curl http://admin:admin@localhost:8181/api/v1/dummy/test -v;
@@ -26,7 +27,8 @@ services:
     networks:
       - learningpulse
     environment:
-      - SPRING_PROFILES_ACTIVE=docker
+      - eureka.client.service-url.defaultZone=http://eureka-server:8761/eureka
+      - eureka.instance.preferIpAddress=true
 
   gateway:
     image: git.4o1x5.dev/learningpulse/server/gateway:dev
@@ -39,7 +41,8 @@ services:
     networks:
       - learningpulse
     environment:
-      - SPRING_PROFILES_ACTIVE=docker
+      - eureka.instance.preferIpAddress=true
+      - eureka.client.service-url.defaultZone=http://eureka-server:8761/eureka
 #
 # TODO once implemented into gateway
 # keycloak:

dummy/src/main/resources/application-docker.yml

@@ -1,9 +1,2 @@
 app:
-  eureka: eureka-server
+  eureka-server: eureka
-
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    service-url:
-        defaultZone: http://${app.eureka}:8761/eureka

dummy/src/main/resources/application.yml

@@ -27,7 +27,9 @@ management:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:8761/eureka
+      #defaultZone: http://localhost:8761/eureka
+      # Will only work when docker is used
+      defaultZone: http://eureka-server:8761/eureka
 
 logging:
   file:

eureka/src/main/resources/application-docker.yml

@@ -1,9 +0,0 @@
-spring:
-  application:
-    name: eureka-server
-eureka:
-  client:
-    register-with-eureka: false
-    fetch-registry: false
-  server:
-    wait-time-in-ms-when-sync-empty: 0

gateway/src/main/resources/application-docker.yml

@@ -1,9 +1,2 @@
 app:
-  eureka-server: eureka
+  eureka-server: eureka
-
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    service-url:
-      defaultZone: http://${app.eureka-server}:8761/eureka