Added aws configuration and deploy

Author: apssouza22

README.md

@@ -1,6 +1,9 @@
 # Bootstrap project to work with microservices using Java
 
-Read the post talking about this [project](https://medium.com/hands-on-microservices-with-java/hands-on-microservices-with-java-e8a5b5b022ee)
+what the videos demonstrating the project
+
+<a href="https://medium.com/@alexsandrosouza/bootstrapping-a-microservices-screencast-7212aa3912cc" target="_blank"><img src="http://img.youtube.com/vi/6LPDbgf5ssU/0.jpg" 
+alt="Bootstrapping a microservice architecture" width="240" height="180" border="10" /></a>
 
 The idea of this project is provide you a bootstrap for your next microservice architecture using Java. 
 On this repository we will be addressing some challenges that everyone faces when are starting with microservices. 
@@ -26,9 +29,9 @@ CQRS, REST, Web Sockets, Continuous deploy with Jenkins, and all developed using
 
 ## How to use
 
-* run package-projects.sh
-* run docker-orchestrate.sh
-* docker-compose -p todo up 
+* run `package-projects.sh`
+* run `docker-orchestrate.sh`
+* `docker-compose -p todo up` 
 
 ## Continuous deploy using Jenkins Pipeline
 We have created a docker image in order to have continuous deploy in our project [here](https://github.com/apssouza22/build-deploy).
@@ -42,6 +45,14 @@ and paste the content of the Jenkinsfile in the Pipeline script box. Have a look
 [video](https://www.youtube.com/watch?v=u3xLXEnlu2M&t=1023s&index=2&list=PLoO1q0-ZB3v6ZN6qvk0dsRRuxjiAQDuZx)
 to check how to work with Jenkins pipeline
 
+### Deploy on AWS 
+* Create your credentials on AWS 
+* Create your cluster on AWS console
+* Have the build-deploy container running (Checkout in the project's README how to do it)
+* Access Jenkins painal
+* Create a pipeline job
+* Run the Job
+
 ### Accessing the services
 * Authenticate -> ```curl -X POST -vu todo-app:123456 http://localhost:8017/oauth/token -H "Accept: application/json" -d "password=1234&username=apssouza22@gmail.com&grant_type=password&scope=write&client_secret=123456&client_id=todo-app"```   
 

aws-compose.yml

@@ -11,17 +11,14 @@ services:
     mem_limit: 1025288000
     cpu_shares: 100
     extra_hosts:
-      - "eureka:52.16.120.13"
+      - "eureka:EC2_INSTANCE_IP"
     environment:
       - JAVA_OPTS=' -Xmx800m'
 
-
   user:
     image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:user-service
     ports:
       - 8016:8016
-    networks:
-      - net
     hostname: user
     container_name: user
     command: ["./wait-for-it.sh","eureka:8010","--timeout=150","--","/usr/local/bin/start.sh"]
@@ -31,8 +28,8 @@ services:
     mem_limit: 1025288000      
     cpu_shares: 100
     extra_hosts:
-      - "config:52.16.120.13"
-      - "eureka:52.16.120.13"
+      - "config:EC2_INSTANCE_IP"
+      - "eureka:EC2_INSTANCE_IP"
     environment:
       - JAVA_OPTS=' -Xmx800m'
 
@@ -46,59 +43,51 @@ services:
     hostname: eureka
     container_name: eureka  
     command: ["./wait-for-it.sh","config:8888","--timeout=100","--","/usr/local/bin/start.sh"]
-    external_links:
-      - elk
     mem_limit: 1025288000  
     cpu_shares: 100
     extra_hosts:
-      - "config:52.16.120.13"
+      - "config:EC2_INSTANCE_IP"
     environment:
       - JAVA_OPTS=' -Xmx800m'
 
-  
-  mail:
-    image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:mail-service
+  oauth:
+    image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:oauth-server
     ports:
-      - 8020:8020
-    networks:
-      - net
-    hostname: mail
-    container_name: mail
-    command: ["./wait-for-it.sh","config:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+      - 8017:8017
+    hostname: oauth
+    container_name: oauth
+    command: ["./wait-for-it.sh","eureka:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    mem_limit: 1025288000   
+    cpu_shares: 100
     extra_hosts:
-      - "config:52.16.120.13"
-      - "eureka:52.16.120.13"
-      - "kafka:52.16.120.13"
-      - "zookeeper:52.16.120.13"
+      - "config:EC2_INSTANCE_IP"
+      - "eureka:EC2_INSTANCE_IP"
     environment:
       - JAVA_OPTS=' -Xmx800m'
-    mem_limit: 1025288000      
-    cpu_shares: 100
 
-  reminder:
-    image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:reminder-service
+  admin:
+    image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:admin-server
+    container_name: admin
     ports:
-      - 8015:8015
-    networks:
-      - net
-    hostname: reminder
-    command: ["./wait-for-it.sh","config:8010","--timeout=150","--","/usr/local/bin/start.sh"]
-    extra_hosts:
-      - "config:52.16.120.13"
-      - "eureka:52.16.120.13"
-      - "kafka:52.16.120.13"
-      - "zookeeper:52.16.120.13"
+      - 8026:8026
     environment:
+      - EUREKA_SERVICE_URL=http://EC2_INSTANCE_IP:8010
+      - EUREKA_INSTANCE_PREFER_IP_ADDRESS=true
+      - LOGGING_FILE=/tmp/admin.log
       - JAVA_OPTS=' -Xmx800m'
-    mem_limit: 1025288000      
+    command: ["./wait-for-it.sh","EC2_INSTANCE_IP:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    mem_limit: 1225288000
     cpu_shares: 100
+    extra_hosts:
+      - "config:EC2_INSTANCE_IP" 
+      - "eureka:EC2_INSTANCE_IP"
+    environment:
+      - JAVA_OPTS=' -Xmx800m'
 
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
       - 2181:2181
-    networks:
-      - net
     mem_limit: 925288000  
     cpu_shares: 100
 
@@ -107,7 +96,7 @@ services:
     ports:
       - 9092:9092
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: "52.16.120.13:2181"
+      KAFKA_ZOOKEEPER_CONNECT: "EC2_INSTANCE_IP:2181"
       KAFKA_CREATE_TOPICS: "todo-mail:1:1"
       HOSTNAME_COMMAND: curl http://169.254.169.254/latest/meta-data/public-hostname
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
@@ -118,9 +107,25 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     hostname: kafka
     container_name: kafka
-    networks:
-      - net
     mem_limit: 1325288000  
     cpu_shares: 100
     extra_hosts:
-      - "zookeeper:52.16.120.13"
+      - "zookeeper:EC2_INSTANCE_IP"
+  
+  reminder:
+    image: 004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex:reminder-service
+    ports:
+      - 8015:8015
+    networks:
+      - net
+    hostname: reminder
+    command: ["./wait-for-it.sh","config:8010","--timeout=150","--","/usr/local/bin/start.sh"]
+    extra_hosts:
+      - "config:52.50.116.215"
+      - "eureka:52.50.116.215"
+      - "kafka:52.50.116.215"
+      - "zookeeper:52.50.116.215"
+    environment:
+      - JAVA_OPTS=' -Xmx800m'
+    mem_limit: 1025288000      
+    cpu_shares: 100

aws-deploy.sh

@@ -3,7 +3,7 @@ set -ex
 
 loginString="$(aws ecr get-login)"
 ${loginString/-e none/ }
-REPOSITORY_URI=004833468061.dkr.ecr.eu-west-1.amazonaws.com/alex
+REPOSITORY_URI=${REPOSITORY_URI}
 
 docker tag todo/oauth-server:latest ${REPOSITORY_URI}:oauth-server
 docker push ${REPOSITORY_URI}:oauth-server

config-server/src/main/resources/offline-repository/eureka-server.yml

@@ -8,10 +8,12 @@ spring:
 
 server:
   port: 8010  
-  
+
 eureka:
   instance:
     hostname: localhost  
+    preferIpAddress: true
+#    ipAddress: 52.50.116.215
   client:
     registerWithEureka: false
     fetchRegistry: false