Update docker config (#265)

Moved root level docker-compose and update docker documentation
* Updated configuration in docker-compose for EI
* Update the travis build for integration tests

Author: e-pettersson-ericsson

.travis.yml

@@ -17,9 +17,11 @@ before_install:
 # This is only run before integrationTests job
 # To ensure docker containers are fully up and running we sleep 20s
 before_script:
-  - source docker-env.bash
+  - cd src/main/docker/
+  - source env.bash
   - docker-compose up -d
   - sleep 60
+  - cd ../../../
 
 
 # Generate site documentation using mvn site plugin

docker-compose.yml

@@ -0,0 +1,31 @@
+## A: Build Eiffel Intelligence Docker image based on Eiffel Intelligence from an Artifactory, e.g. Jitpack:
+cd (git root dir)
+docker build -t eiffel-intelligence-backend:1.0.1 --build-arg URL=https://jitpack.io/com/github/eiffel-community/eiffel-intelligence/1.0.1/eiffel-intelligence-1.0.1.war -f src/main/docker/Dockerfile .
+
+
+
+## B: Build Eiffel Intelligence based on local source code changes
+1. Build Eiffel-Intelligence service artifact:
+cd (git root dir)
+mvn package -DskipTests
+
+2. Build Eiffel Intelligence Docker image:
+cd (git root dir)/
+export EIFFEL_WAR=$(ls target/*.war)
+docker build -t eiffel-intelligence-backend --build-arg URL=./${EIFFEL_WAR} -f src/main/docker/Dockerfile .
+
+
+## Use docker-compose to set up environment for EI testing
+
+The docker-compose file in this directory can be used to set up the proper
+environment for running the integration tests on EI backend. It also includes
+an Eiffel Intelligence backend pre-configured. It is possible to start up Eiffel
+Intelligence backend also in this environment, to try ou local changes. Just
+replace the docker image for ei-backend service with your locally built one.
+Update image versions or ports in src/main/docker/env.bash.
+
+Standing in the root directory, run the below command to set up environment:
+
+  source src/main/docker/env.bash
+  docker-compose -f src/main/docker/docker-compose.yml up -d
+