Merge pull request 'updated docker profiles' (#15) from worky into dev
All checks were successful
build and publish docker image / deploy / build (push) Successful in 1m56s

Reviewed-on: #15
Reviewed-by: Seiwy <bmate20050911@gmail.com>
This commit is contained in:
Seiwy 2024-06-05 09:25:45 +02:00
commit 7fa2ff3b64
5 changed files with 31 additions and 13 deletions

View file

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

View file

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

View file

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

View file

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

View file

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