Completed docker files each service and Generated docker-compose file.

cevheri · cevheri · commit e0b4286983e1 · 2021-06-16T22:21:17.000+03:00
diff --git a/README.md b/README.md
@@ -56,13 +56,33 @@ docker run -d -p 9411:9411 openzipkin/zipkin
 ---
 
 Project Links: 
-- Health : http://localhost:9191/actuator/health
-- Eureka : http://localhost:8761/
-- Department GetMethod: http://localhost:9191/departments/1
-- Hystrix: http://localhost:9295/hystrix
-- http://localhost:9295/hystrix/monitor?stream=http%3A%2F%2Flocalhost%3A9191%2Factuator%2Fhystrix.stream
+- Health : http://person-service:9191/actuator/health
+- Eureka : http://service-registry:8761/
+- Department GetMethod: http://department-service:9191/departments/1
+- Hystrix: http://hystrix-dashboard:9295/hystrix
+- http://hystrix-dashboard:9295/hystrix/monitor?stream=http%3A%2F%2Flocalhost%3A9191%2Factuator%2Fhystrix.stream
 
+## Maven and Docker Build -> jib
+```shell
 
+$ cd service-registry && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd config-server && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd api-gateway && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd hystrix-dashboard && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd department-service && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd person-service && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+$ cd task-service && ./mvnw -Pprod clean verify jib:dockerBuild && cd ..
+```
+
+## Run docker-compose
+```shell
+$ docker-compose -f docker-compose/app.yml up -d
+```
+
+## Stop docker-compose
+```shell
+$ docker-compose -f docker-compose/app.yml down
+```
 
 References:
 
@@ -80,4 +100,3 @@ References:
 - https://www.amazon.com/Spring-Boot-Action-Craig-Walls/dp/1617292540
 - https://www.amazon.com/Spring-Microservices-Action-John-Carnell/dp/1617293989
 - https://www.oreilly.com/library/view/mastering-spring-boot/9781787127562/
-- 
diff --git a/api-gateway/src/main/docker/app.yml b/api-gateway/src/main/docker/app.yml
@@ -2,6 +2,8 @@ version: '3.8'
 services:
   api-gateway:
     image: cevheri/api-gateway
+    container_name: api-gateway
+    hostname: api-gateway
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
     ports:
diff --git a/api-gateway/src/main/resources/application.yml b/api-gateway/src/main/resources/application.yml
@@ -54,5 +54,13 @@ management:
       exposure:
         include: hystrix.stream #, prometheus
 
-
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
+      #defaultZone: http://service-registry:8761/eureka/
+  instance:
+    hostname: service-registry
 
diff --git a/config-server/src/main/docker/app.yml b/config-server/src/main/docker/app.yml
@@ -2,6 +2,8 @@ version: '3.8'
 services:
   config-server:
     image: cevheri/config-server
+    container_name: config-server
+    hostname: config-server
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
     ports:
diff --git a/config-server/src/main/java/com/cevher/ms/config/ConfigServerApplication.java b/config-server/src/main/java/com/cevher/ms/config/ConfigServerApplication.java
@@ -7,7 +7,7 @@
 
 @SpringBootApplication
 @EnableEurekaClient
-@EnableConfigServer
+//@EnableConfigServer
 public class ConfigServerApplication {
 	// We used @EnableEurekaClient and @EnableConfigServer
 	// See application.yml
diff --git a/config-server/src/main/resources/application.yml b/config-server/src/main/resources/application.yml
@@ -4,9 +4,18 @@ server:
 spring:
   application:
     name: config-server
-  cloud:
-    config:
-      server:
-        git:
-          uri: https://github.com/cevheri/microservices-config-server
-          clone-on-start: true
+#  cloud:
+#    config:
+#      server:
+#        git:
+#          uri: https://github.com/cevheri/microservices-config-server
+#          clone-on-start: true
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
+      #defaultZone: http://service-registry:8761/eureka/
+  instance:
+    hostname: service-registry
diff --git a/department-service/src/main/docker/app.yml b/department-service/src/main/docker/app.yml
@@ -2,12 +2,14 @@ version: '3.8'
 services:
   department-service:
     image: cevheri/department-service
+    container_name: department-service
+    hostname: department-service
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - APP_SLEEP=10 # for zipkin
     ports:
-    - 9001:9001
-  zipkin:
-    image: openzipkin/zipkin
-    ports:
-    - 9411:9411
+      - 9001:9001
+#  zipkin:
+#    image: openzipkin/zipkin
+#    ports:
+#    - 9411:9411
diff --git a/department-service/src/main/resources/application.yml b/department-service/src/main/resources/application.yml
@@ -7,5 +7,13 @@ spring:
 server:
   port: 9001
 
-
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
+      #defaultZone: http://service-registry:8761/eureka/
+  instance:
+    hostname: service-registry
 
diff --git a/docker-compose/app.yml b/docker-compose/app.yml
@@ -1,48 +1,115 @@
-version: '3.8'
+version: '3.9'
 services:
   service-registry:
     image: cevheri/service-registry
+    container_name: service-registry
+    hostname: service-registry
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
     ports:
       - 8761:8761
+    networks:
+      - ms-network
   config-server:
     image: cevheri/config-server
+    container_name: config-server
+    hostname: config-server
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
-    - 9296:9296
+      - 9296:9296
+    depends_on:
+      - service-registry
+    networks:
+      - ms-network
   hystrix-dashboard:
-      image: cevheri/hystrix-dashboard
-      environment:
-        - _JAVA_OPTIONS=-Xmx512m -Xms256m
-      ports:
+    image: cevheri/hystrix-dashboard
+    container_name: hystrix-dashboard
+    hostname: hystrix-dashboard
+    environment:
+      - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
+    ports:
       - 9295:9295
+    depends_on:
+      - service-registry
+      - config-server
+    networks:
+      - ms-network
   api-gateway:
     image: cevheri/api-gateway
+    container_name: api-gateway
+    hostname: api-gateway
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
-    - 9191:9191
+      - 9191:9191
+    depends_on:
+      - service-registry
+      - config-server
+    networks:
+      - ms-network
   department-service:
     image: cevheri/department-service
+    container_name: department-service
+    hostname: department-service
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
-    - 9001:9001            
+      - 9001:9001
+    depends_on:
+      - service-registry
+      - config-server
+      - zipkin
+    networks:
+      - ms-network
   person-service:
     image: cevheri/person-service
+    container_name: person-service
+    hostname: person-service
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
-    - 9002:9002
+      - 9002:9002
+    depends_on:
+      - service-registry
+      - config-server
+      - zipkin
+      - department-service
+    networks:
+      - ms-network
   task-service:
     image: cevheri/task-service
+    container_name: task-service
+    hostname: task-service
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
-    - 9003:9003    
+      - 9003:9003
+    depends_on:
+      - service-registry
+      - config-server
+      - zipkin
+      - department-service
+      - person-service
+    networks:
+      - ms-network
   zipkin:
     image: openzipkin/zipkin
+    container_name: zipkin
+    hostname: zipkin
     ports:
-    - 9411:9411
+      - 9411:9411
+    depends_on:
+      - service-registry
+      - config-server
+    networks:
+      - ms-network
+
+networks:
+  ms-network:
diff --git a/hystrix-dashboard/src/main/docker/app.yml b/hystrix-dashboard/src/main/docker/app.yml
@@ -2,6 +2,8 @@ version: '3.8'
 services:
   hystrix-dashboard:
     image: cevheri/hystrix-dashboard
+    container_name: hystrix-dashboard
+    hostname: hystrix-dashboard
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
     ports:
diff --git a/hystrix-dashboard/src/main/docker/jib/entrypoint.sh b/hystrix-dashboard/src/main/docker/jib/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "com.cevher.ms.dashboard.HystrixDashboardApplication"  "$@"
+exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "com.cevher.ms.hystrix.dashboard.HystrixDashboardApplication"  "$@"
diff --git a/hystrix-dashboard/src/main/resources/application.yml b/hystrix-dashboard/src/main/resources/application.yml
@@ -8,3 +8,13 @@ spring:
 hystrix:
   dashboard:
     proxy-stream-allow-list: "*"
+
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
+      #defaultZone: http://service-registry:8761/eureka/
+  instance:
+    hostname: service-registry
diff --git a/person-service/src/main/docker/app.yml b/person-service/src/main/docker/app.yml
@@ -2,12 +2,14 @@ version: '3.8'
 services:
   person-service:
     image: cevheri/person-service
+    container_name: person-service
+    hostname: person-service
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - APP_SLEEP=10 # for zipkin
     ports:
     - 9002:9002
-  zipkin:
-    image: openzipkin/zipkin
-    ports:
-    - 9411:9411
+#  zipkin:
+#    image: openzipkin/zipkin
+#    ports:
+#    - 9411:9411
diff --git a/person-service/src/main/java/com/cevher/ms/person/service/PersonService.java b/person-service/src/main/java/com/cevher/ms/person/service/PersonService.java
@@ -34,7 +34,6 @@ public ResponseTempVM getPersonWithDepartment(Long personId) {
         // TODO : not for production, you should use config and common class or method.
         // TODO : We can use Message Broker for example Apache Kafka
         DepartmentVM department = restTemplate.getForObject(
-                //"http://localhost:9001/departments/" + person.getDepartmentId()
                 "http://department-service/departments/" + person.getDepartmentId()
                 , DepartmentVM.class);
 
diff --git a/person-service/src/main/resources/application.yml b/person-service/src/main/resources/application.yml
@@ -2,9 +2,17 @@ spring:
   application:
     name: person-service
   zipkin:
-    base-url: http://localhost:9411/
+    base-url: http://zipkin:9411/
 
 server:
   port: 9002
 
-
+eureka:
+  client:
+    register-with-eureka: true
+    fetch-registry: true
+    service-url:
+      defaultZone: http://localhost:8761/eureka/
+      #defaultZone: http://service-registry:8761/eureka/
+  instance:
+    hostname: service-registry
diff --git a/service-registry/README.md b/service-registry/README.md
@@ -38,7 +38,7 @@ We will create Docker Image using Google Container Tools and run this Docker Ima
 
 ### Build docker image:
 ```shell
-$ ./mvnw -Pprod verify jib:dockerBuild
+$ ./mvnw -Pprod clean verify jib:dockerBuild
 
 ...
 [INFO] Executing tasks:
@@ -60,7 +60,7 @@ $ docker-compose -f src/main/docker/app.yml up -d
 
 Creating docker_service-registry_1 ... done
 ```
-Visit : http://localhost:8761/
+Visit : http://service-registry:8761/
 
 ---
 ### View docker images:
diff --git a/service-registry/src/main/docker/app.yml b/service-registry/src/main/docker/app.yml
@@ -2,6 +2,8 @@ version: '3.8'
 services:
   service-registry:
     image: cevheri/service-registry
+    hostname: service-registry
+    container_name: service-registry
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - SPRING_PROFILES_ACTIVE=prod
diff --git a/service-registry/src/main/docker/jib/entrypoint.sh b/service-registry/src/main/docker/jib/entrypoint.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-echo "The application will start in ${APP_SLEEP}s..." && sleep ${APP_SLEEP}
+#echo "The application will start in ${APP_SLEEP}s..." && sleep ${APP_SLEEP}
 exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "com.cevher.ms.service.registry.ServiceRegistryApplication"  "$@"
diff --git a/task-service/src/main/docker/app.yml b/task-service/src/main/docker/app.yml
diff --git a/task-service/src/main/resources/application.yml b/task-service/src/main/resources/application.yml
