From 6a9ac3257b23dc29880c1e5ebafc5a6860fd0643 Mon Sep 17 00:00:00 2001 From: Szakalakamaka Date: Thu, 15 Oct 2020 09:38:15 +0200 Subject: [PATCH] EUREKA_INSTANCE_PREFER_IP_ADDRESS: true --- .idea/workspace.xml | 46 +++++++++++-------- Dockerfile | 2 +- docker-compose.yml | 3 ++ src/main/resources/application.properties | 1 + src/main/resources/data-access.properties | 2 +- target/classes/application.properties | 2 +- target/classes/data-access.properties | 2 +- .../mappers/MockedMessageMapperImpl.java | 2 +- 8 files changed, 37 insertions(+), 23 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 431eb79..24270ad 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -24,6 +24,12 @@ + + + + + + @@ -694,36 +700,40 @@ - - + + + - - + + + - - + + + - - + + + @@ -772,13 +782,13 @@ - + - + diff --git a/Dockerfile b/Dockerfile index 994b2b0..db4ae3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,4 @@ COPY --from=layerBuilder application/spring-boot-loader/ ./ COPY --from=layerBuilder application/snapshot-dependencies/ ./ COPY --from=layerBuilder application/application/ ./ -ENTRYPOINT ["java", "-Djava.security.cgd=file:/dev/./urandom", "-Dspring.profiles.active=DEV", "org.springframework.boot.loader.JarLauncher"] +ENTRYPOINT ["java", "-Djava.security.cgd=file:/dev/./urandom", "org.springframework.boot.loader.JarLauncher"] diff --git a/docker-compose.yml b/docker-compose.yml index 3dd2d03..28927c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,9 @@ services: - "8097:8097" depends_on: - redis + environment: + EUREKA_INSTANCE_PREFER_IP_ADDRESS: true + SPRING_PROFILES_ACTIVE: DEV networks: default: external: diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1eaba88..ff451ba 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,6 @@ #environment: eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ + server.port = 8097 spring.application.name = klaus spring.cloud.discovery.enabled=true diff --git a/src/main/resources/data-access.properties b/src/main/resources/data-access.properties index 122952c..27196b6 100644 --- a/src/main/resources/data-access.properties +++ b/src/main/resources/data-access.properties @@ -1,2 +1,2 @@ -redis.host = localhost +redis.host = redis redis.port = 6379 \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties index 899a830..1eaba88 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,5 +1,5 @@ #environment: -eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ +eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ server.port = 8097 spring.application.name = klaus spring.cloud.discovery.enabled=true diff --git a/target/classes/data-access.properties b/target/classes/data-access.properties index 122952c..27196b6 100644 --- a/target/classes/data-access.properties +++ b/target/classes/data-access.properties @@ -1,2 +1,2 @@ -redis.host = localhost +redis.host = redis redis.port = 6379 \ No newline at end of file diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java index e706c81..1b2b051 100644 --- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java +++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2020-10-14T13:24:17+0200", + date = "2020-10-14T15:19:25+0200", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component