Changes:

- docker-compose version to 2.3 to allow mem_limit per container due to excesive use of memory when launching docker-compose.yml services.
- added in IntegrationTests userId for CalculationService new required field
- added local profile in application.yml to allow debug edge-service locally

Author: jusoto

docker-compose.yml

@@ -1,9 +1,10 @@
-version: '3'
+version: '2.3'
 
 services:
 
   edgeservice:
     image: aista/edge-service
+    mem_limit: 512M
     ports:
       - "8080:8080"
     depends_on:
@@ -14,6 +15,7 @@ services:
       - discoveryservice
       - rabbitmq
     image: aista/notification-service
+    mem_limit: 512M
     command: notification-service
     ports:
       - "32700:32700"
@@ -23,6 +25,7 @@ services:
 
   discoveryservice:
     image: aista/eureka
+    mem_limit: 512M
     ports:
       - "8761:8761"
 
@@ -44,6 +47,7 @@ services:
 
   mysqlserver:
     image: mysql:5.7
+    mem_limit: 512M
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -58,6 +62,7 @@ services:
 
   userservice:
     image: aista/user-service
+    mem_limit: 512M
     depends_on:
       - discoveryservice
       - mysqlserver
@@ -66,34 +71,38 @@ services:
 
   mongo:
     image: 'mongo:3.4.1'
+    mem_limit: 512M
     container_name: 'mongo'
     ports:
       - '27017:27017'
     volumes:
       - 'mongo:/data/db'
 
-  postgres:
-    image: postgres
-    restart: always
-    environment:
-      POSTGRES_DB: 'passenger_db'
-      POSTGRES_PASSWORD: "admin"
-      POSTGRES_USER: "admin"
-      PGDATA: ./postgres-data
-    ports:
-      - '5432:5432'
-    volumes:
-      - ./db_volume:/var/lib/postgresql
+#  postgres:
+#    image: postgres
+#    mem_limit: 512M
+#    restart: always
+#    environment:
+#      POSTGRES_DB: 'passenger_db'
+#      POSTGRES_PASSWORD: "admin"
+#      POSTGRES_USER: "admin"
+#      PGDATA: ./postgres-data
+#    ports:
+#      - '5432:5432'
+#    volumes:
+#      - ./db_volume:/var/lib/postgresql
 
   rabbitmq:
     image: rabbitmq:management
+    mem_limit: 512M
     container_name: 'rabbitmq'
     ports:
       - "5672:5672"
       - "15672:15672"
 
   tripmanagementcmd:
     image: aista/trip-management-cmd
+    mem_limit: 512M
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -106,6 +115,7 @@ services:
 
   tripmanagementquery:
     image: aista/trip-management-query
+    mem_limit: 512M
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -118,6 +128,7 @@ services:
 
   gmaps-adapter:
     image: aista/gmaps-adapter
+    mem_limit: 512M
     environment:
       - EUREKA_SERVER=discoveryservice
       - RABBIT_HOST=rabbitmq
@@ -128,6 +139,7 @@ services:
 
   calculation-service:
     image: aista/calculation-service
+    mem_limit: 512M
     environment:
       - EUREKA_SERVER=discoveryservice
       - RABBIT_HOST=rabbitmq
@@ -137,37 +149,40 @@ services:
     depends_on:
       - discoveryservice
 
-  passenger:
-    image: aista/passenger
-    ports:
-      - '8080'
-    depends_on:
-      - postgres
-      - discoveryservice
-
-  driver-cmd:
-    image: aista/driver-cmd
-    environment:
-      - EUREKA_SERVER=discoveryservice
-    ports:
-      - '8080'
-    depends_on:
-      - rabbitmq
-      - mongo
-      - discoveryservice
-
-  driver-query:
-    image: aista/driver-query
-    container_name: 'driver-query'
-    environment:
-      - RABBIT_HOST=rabbitmq
-      - MONGO_HOST=mongo
-    ports:
-      - "8080"
-    depends_on:
-      - rabbitmq
-      - mongo
-      - discoveryservice
+#  passenger:
+#    image: aista/passenger
+#    mem_limit: 512M
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - postgres
+#      - discoveryservice
+#
+#  driver-cmd:
+#    image: aista/driver-cmd
+#    mem_limit: 512M
+#    environment:
+#      - EUREKA_SERVER=discoveryservice
+#    ports:
+#      - '8080'
+#    depends_on:
+#      - rabbitmq
+#      - mongo
+#      - discoveryservice
+#
+#  driver-query:
+#    image: aista/driver-query
+#    mem_limit: 512M
+#    container_name: 'driver-query'
+#    environment:
+#      - RABBIT_HOST=rabbitmq
+#      - MONGO_HOST=mongo
+#    ports:
+#      - "8080"
+#    depends_on:
+#      - rabbitmq
+#      - mongo
+#      - discoveryservice
 
 volumes:
   mongo:

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

@@ -1,6 +1,6 @@
 package aist.edge.edgeservice;
 
-
+import java.util.Arrays;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,8 +10,6 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-import java.util.Arrays;
-
 @Configuration
 public class ConfigurationCORS extends WebSecurityConfigurerAdapter {
 
@@ -21,7 +19,7 @@ protected void configure(HttpSecurity http) throws Exception {
     }
 
     @Bean
-    public CorsConfigurationSource corsConfigurationSource()  {
+    public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedOrigins(Arrays.asList("*"));
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));

src/main/resources/application.yml

@@ -1,6 +1,3 @@
-spring:
-  profiles:
-    active: development
 ---
 spring:
   profiles: development
@@ -36,6 +33,7 @@ management:
   security:
     enabled: false
   context-path: /actuator
+  
 ---
 spring:
   profiles: docker
@@ -68,6 +66,42 @@ eureka:
     serviceUrl:
       defaultZone: http://discoveryservice:8761/eureka/
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
+ribbon:
+  ConnectTimeout: 3000
+ReadTimeout: 60000
+
+---
+spring:
+  profiles: local
+  application:
+    name: edgeservice
+zuul:
+  prefix: /api
+  routes:
+    trip-cmd:
+      path: /trip/cmd/**
+      url: http://${DOCKER_MACHINE_IP:localhost}:8080/api
+    trip-query:
+      path: /trip/query/**
+      url: http://${DOCKER_MACHINE_IP:localhost}:8080/api
+    userservice:
+      path: /userservice/**
+      url: http://${DOCKER_MACHINE_IP:localhost}:8080/
+      sensitiveHeaders: Cookie,Set-Cookie
+security:
+  oauth2:
+    resource:
+      userInfoUri: http://${DOCKER_MACHINE_IP:localhost}:8080/auth/user
+  ignored: /catalog/**
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://${DOCKER_MACHINE_IP:localhost}:8761/eureka/
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 ribbon:
   ConnectTimeout: 3000
 ReadTimeout: 60000

src/main/resources/bootstrap.yml

@@ -0,0 +1,9 @@
+spring:
+  application:
+    name: edgeservice
+  profiles:
+    active: development
+  cloud:
+    config:
+      uri: http://${CONFIGURATION_HOST:localhost}:8888
+      enabled: true