Merge remote-tracking branch 'origin/main'

Author: cevheri

README.md

@@ -1,15 +1,14 @@
-# Sprint Boot Microservices Example
+# Java Spring-Boot Microservices Example
 
+Light-weight sample for Microservices learning
 
-
- 
 ---
-### Services Registry
+### [Services Registry](service-registry)
 - Spring Boot version: 2.5.0
 - Dependencies:
   - spring-cloud-starter-netflix-eureka-server
 ---
-### API Gateway
+### [API Gateway](api-gateway)
 Spring Boot version: 2.3.11.RELEASE
 - Dependencies:
   - spring-cloud-starter-gateway  
@@ -18,15 +17,15 @@ Spring Boot version: 2.3.11.RELEASE
   - spring-cloud-starter-config
   - 
 ---
-### Config Server
+### [Config Server](config-server)
 - Spring Boot version: 2.5.0
-- Github repository -> application.yml 
+- GitHub repository -> application.yml 
 - Dependencies:
   - spring-cloud-config-server
   - spring-cloud-starter-netflix-eureka-client
-- Zookeper (not yet)
+- Zookeeper (not yet)
 ---
-### Hystrix Dashboard
+### [Hystrix Dashboard](hystrix-dashboard)
 - Spring Boot version: 2.3.11.RELEASE
 - Dependencies:
   - spring-cloud-starter-config
@@ -35,7 +34,7 @@ Spring Boot version: 2.3.11.RELEASE
 ---
 ### Other Microservices
 - Spring Boot version: 2.5.0
-- Person, Department, Task Mangement Services
+- [Person](person-service), [Department](department-service), [Task Management](task-service) Services
 - Dependencies:
   - spring-cloud-starter-config
   - spring-cloud-starter-netflix-eureka-client
@@ -46,10 +45,15 @@ Spring Boot version: 2.3.11.RELEASE
   - spring-boot-starter-web 
 ---
 
+### [Docker Compose](docker-compose)
+Launch all service
+```shell
+$ docker-compose -f docker-compose/app.yml up -d
+```
 
 ### Zipkin
 Docker
-The Docker Zipkin project is able to build docker images, provide scripts and a docker-compose.yml for launching pre-built images. The quickest start is to run the latest image directly:
+The Docker Zipkin project is able to build docker images, provide scripts, and a docker-compose.yml for launching pre-built images. The quickest start is to run the latest image directly:
 
 docker run -d -p 9411:9411 openzipkin/zipkin
 
@@ -84,7 +88,11 @@ $ docker-compose -f docker-compose/app.yml up -d
 $ docker-compose -f docker-compose/app.yml down
 ```
 
-References:
+### Screenshots
+
+![All Microservices UP](files/pictures/microservices-allservice-on-eureka.png)
+
+### References:
 
 - https://spring.io/microservices
 - https://microservices.io/patterns/microservices.html

api-gateway/src/main/resources/application.yml

@@ -59,8 +59,8 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: http://localhost:8761/eureka/
-      #defaultZone: http://service-registry:8761/eureka/
+      # defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://service-registry:8761/eureka/
   instance:
     hostname: service-registry
 

api-gateway/src/main/resources/bootstrap.yml

@@ -2,4 +2,4 @@ spring:
   cloud:
     config:
       enabled: true
-      uri: http://localhost:9296
+      uri: http://config-server:9296

config-server/src/main/docker/app.yml

@@ -6,5 +6,6 @@ services:
     hostname: config-server
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
+      - EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE=http://service-registry:8761/eureka
     ports:
     - 9296:9296

config-server/src/main/resources/application.yml

@@ -10,12 +10,14 @@ spring:
 #        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/
+      # for local run
+      # defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://service-registry:8761/eureka/
   instance:
     hostname: service-registry

department-service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: department-service
   zipkin:
-    base-url: http://127.0.0.1:9411/
+    base-url: http://zipkin:9411/
 
 server:
   port: 9001
@@ -12,8 +12,8 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: http://localhost:8761/eureka/
-      #defaultZone: http://service-registry:8761/eureka/
+      #defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://service-registry:8761/eureka/
   instance:
     hostname: service-registry
 

department-service/src/main/resources/bootstrap.yml

@@ -2,4 +2,4 @@ spring:
   cloud:
     config:
       enabled: true
-      uri: http://localhost:9296
+      uri: http://config-server:9296

files/pictures/microservices-allservice-on-eureka.png

@@ -0,0 +1,58 @@
+
+# jib build images
+cd ~/projects/springboot-microservices-example/service-registry   && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/config-server      && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/api-gateway        && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/hystrix-dashboard  && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/department-service && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/person-service     && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+cd ~/projects/springboot-microservices-example/task-service       && ./mvnw -Pprod clean verify jib:dockerBuild && cd ~
+
+# network config
+docker network create ms-network
+docker network connect ms-network service-registry #or run
+
+# run images
+docker run -d --network ms-network -p 8761:8761 --name service-registry cevheri/service-registry:latest
+docker run -d --network ms-network -p 9296:9296 --name config-server cevheri/config-server
+docker run -d --network ms-network -p 9191:9191 --name api-gateway cevheri/api-gateway:latest
+docker run -d --network ms-network -p 9295:9295 --name hystrix-dashboard cevheri/hystrix-dashboard:latest
+docker run -d --network ms-network -p 9001:9001 --name department-service cevheri/department-service:latest
+docker run -d --network ms-network -p 9002:9002 --name person-service cevheri/person-service:latest
+docker run -d --network ms-network -p 9003:9003 --name task-service cevheri/task-service:latest
+
+# set docker tag and docker push hub.docker remote repository
+docker tag cevheri/service-registry:latest cevheri/service-registry:latest
+docker tag cevheri/service-registry:latest cevheri/service-registry:v1.2.0
+docker push cevheri/service-registry:v1.2.0
+docker push cevheri/service-registry:latest
+
+docker tag cevheri/config-server:latest cevheri/config-server:latest
+docker tag cevheri/config-server:latest cevheri/config-server:v1.2.0
+docker push cevheri/config-server:v1.2.0
+docker push cevheri/config-server:latest
+
+docker tag cevheri/api-gateway:latest cevheri/api-gateway:latest
+docker tag cevheri/api-gateway:latest cevheri/api-gateway:v1.2.0
+docker push cevheri/api-gateway:v1.2.0
+docker push cevheri/api-gateway:latest
+
+docker tag cevheri/hystrix-dashboard:latest cevheri/hystrix-dashboard:latest
+docker tag cevheri/hystrix-dashboard:latest cevheri/hystrix-dashboard:v1.2.0
+docker push cevheri/hystrix-dashboard:v1.2.0
+docker push cevheri/hystrix-dashboard:latest
+
+docker tag cevheri/department-service:latest cevheri/department-service:latest
+docker tag cevheri/department-service:latest cevheri/department-service:v1.2.0
+docker push cevheri/department-service:v1.2.0
+docker push cevheri/department-service:latest
+
+docker tag cevheri/person-service:latest cevheri/person-service:latest
+docker tag cevheri/person-service:latest cevheri/person-service:v1.2.0
+docker push cevheri/person-service:v1.2.0
+docker push cevheri/person-service:latest
+
+docker tag cevheri/task-service:latest cevheri/task-service:latest
+docker tag cevheri/task-service:latest cevheri/task-service:v1.2.0
+docker push cevheri/task-service:v1.2.0
+docker push cevheri/task-service:latest

files/scripts/dockerscript.sh

@@ -14,7 +14,7 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     service-url:
-      defaultZone: http://localhost:8761/eureka/
-      #defaultZone: http://service-registry:8761/eureka/
+      # defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://service-registry:8761/eureka/
   instance:
     hostname: service-registry