From ac4171f888e47d9a6e0ed73b795c600ea82c215f Mon Sep 17 00:00:00 2001
From: 4o1x5 <4o1x5@4o1x5.dev>
Date: Sat, 1 Jun 2024 18:30:19 +0200
Subject: [PATCH] docker-compose: now services seem to respond

---
 docker-compose.yml | 74 +++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 84073d2..ba114c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 version: "3"
-
+# https://scribe.rip/@kadampritesh46/microservices-part-4-dockerization-and-beyond-55693a2419e7
 networks:
   learningpulse: {}
 services:
@@ -9,7 +9,14 @@ services:
     hostname: eureka-server
     networks:
       - learningpulse
+    environment:
+      - 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;
   dummy:
     image: git.4o1x5.dev/learningpulse/server/dummy:dev
     restart: always
@@ -18,8 +25,8 @@ services:
     networks:
       - learningpulse
     environment:
-      EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eureka-server:8761/eureka
-
+      - eureka.client.service-url.defaultZone=http://eureka-server:8761/eureka
+      - eureka.instance.preferIpAddress=true
   gateway:
     image: git.4o1x5.dev/learningpulse/server/gateway:dev
     restart: always
@@ -31,34 +38,35 @@ services:
     networks:
       - learningpulse
     environment:
-      EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eureka-server:8761/eureka
+      - eureka.instance.preferIpAddress=true
+      - eureka.client.service-url.defaultZone=http://eureka-server:8761/eureka
+#
+# TODO once implemented into gateway
+# keycloak:
+#   container_name: keycloak
+#   hostname: keycloak
+#   image: quay.io/keycloak/keycloak:latest
+#   command: ["start-dev", "--import-realm"]
+#   ports:
+#     - "3212:8080"
+#   volumes:
+#     - ./realms:/opt/keycloak/data/import
+#   environment:
+#     KC_DB: ${DB_NAME}
+#     KC_DB_URL: ${DB_URL}
+#     KC_DB_USERNAME: ${DB_USERNAME}
+#     KC_DB_PASSWORD: ${DB_PASSWORD}
+#     KC_DB_SCHEMA: ${DB_SCHEMA}
+#     KEYCLOAK_ADMIN: admin
+#     KEYCLOAK_ADMIN_PASSWORD: admin
+#     KC_HTTP_ENABLED: true
 
-  # TODO once implemented into gateway
-  # keycloak:
-  #   container_name: keycloak
-  #   hostname: keycloak
-  #   image: quay.io/keycloak/keycloak:latest
-  #   command: ["start-dev", "--import-realm"]
-  #   ports:
-  #     - "3212:8080"
-  #   volumes:
-  #     - ./realms:/opt/keycloak/data/import
-  #   environment:
-  #     KC_DB: ${DB_NAME}
-  #     KC_DB_URL: ${DB_URL}
-  #     KC_DB_USERNAME: ${DB_USERNAME}
-  #     KC_DB_PASSWORD: ${DB_PASSWORD}
-  #     KC_DB_SCHEMA: ${DB_SCHEMA}
-  #     KEYCLOAK_ADMIN: admin
-  #     KEYCLOAK_ADMIN_PASSWORD: admin
-  #     KC_HTTP_ENABLED: true
-
-  # TODO once implemented into service(s)
-  # database:
-  #   image: postgres
-  #   restart: always
-  #   hostname: database
-  #   environment:
-  #     POSTGRES_USER: ${DABATASE_USER}
-  #     POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-  #     POSTGRES_DB: ${DATABASE_NAME}
+# TODO once implemented into service(s)
+# database:
+#   image: postgres
+#   restart: always
+#   hostname: database
+#   environment:
+#     POSTGRES_USER: ${DABATASE_USER}
+#     POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+#     POSTGRES_DB: ${DATABASE_NAME}