Added docker compose file for using local images.

Author: R4il

Dockerfile

@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java:8
 MAINTAINER Justin Phillips "[email protected]"
 VOLUME /tmp
-ADD build/libs/microservices--backing-service--edge-service-0.0.1.jar app.jar
+ADD build/libs/edge-service-0.0.1.jar app.jar
 RUN bash -c 'touch /app.jar'
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]

build.gradle

@@ -45,7 +45,7 @@ dependencies {
     compile('org.springframework.security:spring-security-test')
     compile('org.springframework.cloud:spring-cloud-starter-eureka')
     compile('org.springframework.cloud:spring-cloud-starter-hystrix')
-    compile('org.springframework.cloud:spring-cloud-starter-oauth2')
+    //compile('org.springframework.cloud:spring-cloud-starter-oauth2')
     compile('org.springframework.cloud:spring-cloud-starter-zuul')
     compile('org.springframework.boot:spring-boot-starter-web')
     providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')

docker-compose-local.yml

@@ -0,0 +1,114 @@
+version: '3'
+
+services:
+
+  edgeservice:
+    build: ./
+    ports:
+      - "80:8080"
+    depends_on:
+      - discovery-service
+
+  discovery-service:
+    image: springcloud/eureka
+    ports:
+      - "8761:8761"
+
+#  hystrix-dashboard:
+#    image: kbastani/hystrix-dashboard
+#    container_name: hystrix-dashboard
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 6161:6161
+
+#  config-service:
+#    build: config-service
+#    container_name: config-service
+#    environment:
+#      - SPRING_PROFILES_ACTIVE=docker
+#    ports:
+#      - 8888:8888
+
+  mysqlserver:
+    image: mysql:5.7
+    volumes:
+      - mysql-data:/var/lib/mysql:rw
+    restart: always
+    ports:
+      - '3306:3306'
+    environment:
+      MYSQL_USER:
+      MYSQL_PASSWORD:
+      MYSQL_ROOT_PASSWORD: 'root'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_DATABASE: 'user_service'
+
+  userservice:
+    image: aista/user-service
+    depends_on:
+      - discovery-service
+      - mysqlserver
+    ports:
+      - '8091:8091'
+
+  mongo:
+    image: 'mongo:3.4.1'
+    container_name: 'mongo'
+    ports:
+      - '27017:27017'
+    volumes:
+      - 'mongo:/data/db'
+
+  rabbitmq:
+    image: rabbitmq:management
+    container_name: 'rabbitmq'
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
+  tripmanagementcmd:
+    image: aista/trip-management-cmd:local
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+      - rabbitmq
+      - mongo
+
+  tripmanagementquery:
+    image: aista/trip-management-query:local
+    environment:
+      - RABBIT_HOST=rabbitmq
+      - MONGO_HOST=mongo
+    ports:
+      - '8080'
+    depends_on:
+      - rabbitmq
+      - mongo
+      - discovery-service
+
+  gmapsadapter:
+    image: aista/gmaps-adapter:local
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+  calculationservice:
+    image: aista/calculation-service:local
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+volumes:
+  mongo:
+  mysql-data:

docker-compose.yml

@@ -2,18 +2,17 @@ version: '3'
 
 services:
 
-  edge-service:
+  edgeservice:
     build: ./
     ports:
-      - "8080:8080"
+      - "80:8080"
     depends_on:
       - discovery-service
 
   discovery-service:
     image: springcloud/eureka
     ports:
       - "8761:8761"
-    container_name: eureka-server
 
 #  hystrix-dashboard:
 #    image: kbastani/hystrix-dashboard
@@ -31,9 +30,8 @@ services:
 #    ports:
 #      - 8888:8888
 
-  mysql-server:
+  mysqlserver:
     image: mysql:5.7
-    container_name: mysql-server
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -46,12 +44,11 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
       MYSQL_DATABASE: 'user_service'
 
-  microservice--user-service:
+  userservice:
     image: aista/user-service
     depends_on:
       - discovery-service
-      - mysql-server
-    container_name: microservice--user-service
+      - mysqlserver
     ports:
       - '8091:8091'
 
@@ -70,9 +67,8 @@ services:
       - "5672:5672"
       - "15672:15672"
 
-  trip-management-cmd:
+  tripmanagementcmd:
     image: aista/trip-management-cmd
-    container_name: trip-management-cmd
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -83,9 +79,8 @@ services:
       - rabbitmq
       - mongo
 
-  trip-management-query:
+  tripmanagementquery:
     image: aista/trip-management-query
-    container_name: trip-management-query
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -94,7 +89,25 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service 
+      - discovery-service
+
+  gmapsadapter:
+    image: aista/gmaps-adapter
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+  calculationservice:
+    image: aista/calculation-service
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
 
 volumes:
   mongo:

readme.md

@@ -1,2 +1,14 @@
 # Edge Service
-The edge service is one of the backing services that serves as the front door for the API. The services utilizes Zuul.
+The edge service is one of the backing services that serves as the front door for the API. The services utilizes Zuul.
+
+# Running the service:
+
+After making sure the project assembled properly run:  ```docker-compose up --build```
+
+## Running with locally build images.
+
+Build the images locally but tag them with version ```:local``` instead of default, for example instead of just building gmaps-adapter as aista/gmaps-adapter tag it aista/gmaps-adapter:local 
+
+Run ```docker-compose -f docker-compose-local.yml up```
+
+remove the :local from the docker-compose-local.yml file for images that wont be changed locally.

src/main/java/aist/edge/edgeservice/EdgeServiceApplication.java

@@ -5,12 +5,12 @@
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+//import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 
 @SpringBootApplication
 @EnableEurekaClient
 @EnableZuulProxy
-@EnableResourceServer
+//@EnableResourceServer
 @EnableHystrix
 public class EdgeServiceApplication {
     public static void main(String[] args) {

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: development
+    active: docker
 ---
 spring:
   profiles: development
@@ -31,10 +31,16 @@ spring:
   application:
     name: edge-service
 zuul:
-  ignored-services: '*'
-  ignoredPatterns: /**/api/**
+  prefix: /api
   routes:
-    example-service: /example/**
+    trip-cmd:
+      path: /trip/cmd/**
+      serviceId: tripmanagementcmd
+      prefix: /api
+    trip-query:
+      path: /trip/query/**
+      serviceId: tripmanagementquery
+      prefix: /api
 security:
   oauth2:
     resource:

src/test/resources/docker-compose.yml

@@ -89,6 +89,24 @@ services:
       - mongo
       - discovery-service
 
+  gmaps-adapter:
+    image: aista/gmaps-adapter
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
+  calculation-service:
+    image: aista/calculation-service
+    environment:
+      - EUREKA_SERVER=discovery-service
+    ports:
+      - '8080'
+    depends_on:
+      - discovery-service
+
 volumes:
   mongo:
   mysql-data: