EUREKA_INSTANCE_PREFER_IP_ADDRESS: true

2020-10-15 09:38:15 +02:00
parent f2c076c1d1
commit 6a9ac3257b
8 changed files with 37 additions and 23 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,6 +24,12 @@
  <component name="ChangeListManager">
    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/data-access.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -263,13 +269,6 @@
      <option name="presentableId" value="Default" />
      <updated>1598862102028</updated>
    </task>
-    <task id="LOCAL-00055" summary="adding logs from the application">
-      <created>1601295096309</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1601295096309</updated>
-    </task>
    <task id="LOCAL-00056" summary="adding logs from the application">
      <created>1601295490642</created>
      <option name="number" value="00056" />
@@ -606,7 +605,14 @@
      <option name="project" value="LOCAL" />
      <updated>1602675615735</updated>
    </task>
-    <option name="localTasksCounter" value="104" />
+    <task id="LOCAL-00104" summary="updating cloud settings">
+      <created>1602678114572</created>
+      <option name="number" value="00104" />
+      <option name="presentableId" value="LOCAL-00104" />
+      <option name="project" value="LOCAL" />
+      <updated>1602678114572</updated>
+    </task>
+    <option name="localTasksCounter" value="105" />
    <servers />
  </component>
  <component name="UnknownFeatures">
@@ -694,36 +700,40 @@
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" />
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602662342585" />
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
-    <state width="1877" height="309" key="GridCell.Tab.0.bottom" timestamp="1602674787447">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="58" key="GridCell.Tab.0.bottom" timestamp="1602683462011">
+      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
    <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
    <state width="1877" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
+    <state width="1493" height="58" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
    <state width="1877" height="309" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
    <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="309" key="GridCell.Tab.0.center" timestamp="1602674787447">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="58" key="GridCell.Tab.0.center" timestamp="1602683462011">
+      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
    <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
    <state width="1877" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424968" />
+    <state width="1493" height="58" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
    <state width="1877" height="309" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
    <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="309" key="GridCell.Tab.0.left" timestamp="1602674787447">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="58" key="GridCell.Tab.0.left" timestamp="1602683462010">
+      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
    <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
    <state width="1877" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424967" />
+    <state width="1493" height="58" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462010" />
    <state width="1877" height="309" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
    <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="309" key="GridCell.Tab.0.right" timestamp="1602674787447">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="58" key="GridCell.Tab.0.right" timestamp="1602683462011">
+      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
    <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
    <state width="1877" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
+    <state width="1493" height="58" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602683462011" />
    <state width="1877" height="309" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602674787447" />
    <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
    <state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
@@ -772,13 +782,13 @@
    </state>
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1602675616881">
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1602678116120">
      <screen x="1920" y="0" width="1920" height="1160" />
    </state>
    <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
    <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255416393" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602675616881" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602678116120" />
    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
    <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
      <screen x="1920" y="0" width="1920" height="1040" />
--- a/2
+++ b/2
@@ -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"]
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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