Update docker-compose with EI 2.0.0 (#254)

* Update docker-compose to take EI 2.0.0

Author: e-pettersson-ericsson

src/main/docker/docker-compose.yml

@@ -251,7 +251,7 @@ services:
       eiffel_2.0_1:
         aliases:
           - ei-backend-artifact
-    environment:       # Overrides settings in application config file
+    environment:       # Overrides settings in application.properties file
       - SpringApplicationName=ei-backend-artifact
       - server.port=8080
       - rules.path=/rules/ArtifactRules-Eiffel-Agen-Version.json
@@ -267,13 +267,12 @@ services:
       - spring.data.mongodb.port=${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-artifact
       - missedNotificationDataBaseName=MissedNotification-artifact
-      - search.query.prefix=object
-      - aggregated.object.name=aggregatedObject
+      - aggregated.collection.name=aggregated-objects-artifact
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
       - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
-      - logging.level.root=OFF
-      - logging.level.org.springframework.web=DEBUG
+      - logging.level.root=ERROR
+      - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
       - WAIT_MB_HOSTS=rabbitmq:${RABBITMQ_WEB_PORT}
       - WAIT_DB_HOSTS=mongodb:${MONGODB_PORT}
@@ -302,7 +301,7 @@ services:
       eiffel_2.0_1:
         aliases:
           - ei-backend-sourcechange
-    environment:       # Overrides settings in application config file
+    environment:       # Overrides settings in application.properties file
       - SpringApplicationName=ei-backend-sourcechange
       - server.port=8080
       - rules.path=/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json
@@ -318,13 +317,12 @@ services:
       - spring.data.mongodb.port=${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-sourcechange
       - missedNotificationDataBaseName=MissedNotification-sourcechange
-      - search.query.prefix=object
-      - aggregated.object.name=aggregatedObject
+      - aggregated.collection.name=aggregated-objects-sourcechange
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
       - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
-      - logging.level.root=OFF
-      - logging.level.org.springframework.web=DEBUG
+      - logging.level.root=ERROR
+      - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
       - WAIT_MB_HOSTS=rabbitmq:${RABBITMQ_WEB_PORT}
       - WAIT_DB_HOSTS=mongodb:${MONGODB_PORT}
@@ -353,7 +351,7 @@ services:
       eiffel_2.0_1:
         aliases:
           - ei-backend-testexecution
-    environment:       # Overrides settings in application config file
+    environment:       # Overrides settings in application.properties file
       - SpringApplicationName=ei-backend-testexecution
       - server.port=8080
       - rules.path=/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json
@@ -369,17 +367,16 @@ services:
       - spring.data.mongodb.port=${MONGODB_PORT}
       - spring.data.mongodb.database=eiffel-intelligence-testexecution
       - missedNotificationDataBaseName=MissedNotification-testexecution
-      - search.query.prefix=object
-      - aggregated.object.name=aggregatedObject
+      - aggregated.collection.name=aggregated-objects-testexecution
       - spring.mail.host=
       - spring.mail.port=
       - spring.mail.username=
       - spring.mail.password=
       - spring.mail.properties.mail.smtp.auth=false
       - spring.mail.properties.mail.smtp.starttls.enable=false
       - er.url=http://eiffel-er:${EIFFEL_ER_INTERNAL_PORT}/search
-      - logging.level.root=OFF
-      - logging.level.org.springframework.web=DEBUG
+      - logging.level.root=ERROR
+      - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
       - WAIT_MB_HOSTS=rabbitmq:${RABBITMQ_WEB_PORT}
       - WAIT_DB_HOSTS=mongodb:${MONGODB_PORT}
@@ -407,16 +404,16 @@ services:
       eiffel_2.0_1:
         aliases:
           - ei-frontend
-    environment:      # Overrides settings in application config file
+    environment:      # Overrides settings in application.properties file
       - spring.application.name=eiffel-intelligence-frontend
       - server.port=8080
       - ei.frontend.service.host=${HOST}
       - ei.frontend.service.port=${EI_FRONTEND_PORT}
       - ei.frontend.context.path=
       - ei.backend.instances.list.json.content=${EI_INSTANCES_LIST}
       - ei.backend.instances.filepath=/tmp/eiInstancesListFile.json
-      - logging.level.root=OFF
-      - logging.level.org.springframework.web=DEBUG
+      - logging.level.root=ERROR
+      - logging.level.org.springframework.web=ERROR
       - logging.level.com.ericsson.ei=DEBUG
 
   ldap:

src/main/docker/env.bash

@@ -14,8 +14,8 @@ export MAILSERVER_IMAGE="mailhog/mailhog"
 export REMREM_GENERATE_IMAGE="eiffelericsson/eiffel-remrem-generate:2.0.4"
 export REMREM_PUBLISH_IMAGE="eiffelericsson/eiffel-remrem-publish:2.0.2"
 export JENKINS_IMAGE="bitnami/jenkins:2.138.3"
-export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:1.0.2"
-export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:1.0.3"
+export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:2.0.0"
+export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:2.0.0"
 export LDAP_IMAGE="osixia/openldap:1.2.4"
 
 export MONGODB_PORT=27017