From 4902b9a8acf807bd277263d517b30d945f652c7a Mon Sep 17 00:00:00 2001
From: Alexander <nikal@kth.se>
Date: Sun, 26 Mar 2017 17:53:04 +0200
Subject: [PATCH] Uncomment shell_scripts and adding jobapplication services to
 CI file

---
 .travis.yml                                   |  4 +++
 docker-compose.yml                            |  1 +
 .../build-services-docker-toolbox.sh          |  2 +-
 shell_scripts/build-services-docker-unix.sh   | 30 +++++++++++--------
 shell_scripts/start-config-service.sh         |  2 --
 shell_scripts/start-services.sh               |  2 +-
 6 files changed, 25 insertions(+), 16 deletions(-)
 delete mode 100644 shell_scripts/start-config-service.sh

diff --git a/.travis.yml b/.travis.yml
index 1d63f80..8064257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,4 +16,8 @@ script:
 
 script:
   - cd discoveryservice
+  - mvn test -B
+
+script:
+  - cd jobapplicationservice
   - mvn test -B
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f8e862..36b4655 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,5 @@
 #This should be run after config-service is up
+#NOT USED FOR NOW: use shell_scripts/start-services.sh
 
 version: '2'
 services:
diff --git a/shell_scripts/build-services-docker-toolbox.sh b/shell_scripts/build-services-docker-toolbox.sh
index 25b5f19..1f898ca 100644
--- a/shell_scripts/build-services-docker-toolbox.sh
+++ b/shell_scripts/build-services-docker-toolbox.sh
@@ -2,7 +2,7 @@
 #Setting enviroment variables - needed for maven docker plugin if running docker toolbox
 echo Setting enviroment variables
 export DOCKER_HOST=https://192.168.99.100:2376
-export DOCKER_CERT_PATH=C:/Users/addeg/.docker/machine/machines/default
+export DOCKER_CERT_PATH=C:/Users/Alexander/.docker/machine/machines/default
 
 echo
 
diff --git a/shell_scripts/build-services-docker-unix.sh b/shell_scripts/build-services-docker-unix.sh
index 4299ed8..15e84dd 100644
--- a/shell_scripts/build-services-docker-unix.sh
+++ b/shell_scripts/build-services-docker-unix.sh
@@ -20,14 +20,14 @@ echo
 echo
 
 #Building edgeservice with maven docker plugin
-#echo Building edgeservice
-#cd ..
-#cd edgeservice
-#mvn package docker:build -Ddocker.host=$DOCKER_HOST -Ddocker.cert.path=$DOCKER_CERT_PATH
-#
-#echo
-#echo
-#echo
+echo Building edgeservice
+cd ..
+cd edgeservice
+mvn package docker:build -Ddocker.host=$DOCKER_HOST -Ddocker.cert.path=$DOCKER_CERT_PATH
+
+echo
+echo
+echo
 
 #Building authentication-service with maven docker plugin
 echo Building authentication service
@@ -40,7 +40,13 @@ echo
 echo
 
 #Building registration-service with maven docker plugin
-#echo Building registration service
-#cd ..
-#cd registration-service
-#mvn package docker:build -Ddocker.host=$DOCKER_HOST -Ddocker.cert.path=$DOCKER_CERT_PATH
\ No newline at end of file
+echo Building registration service
+cd ..
+cd registration-service
+mvn package docker:build -Ddocker.host=$DOCKER_HOST -Ddocker.cert.path=$DOCKER_CERT_PATH
+
+#Building jobapplication-service with maven docker plugin
+echo Building jobapplication service
+cd ..
+cd jobapplication
+mvn package docker:build -Ddocker.host=$DOCKER_HOST -Ddocker.cert.path=$DOCKER_CERT_PATH
\ No newline at end of file
diff --git a/shell_scripts/start-config-service.sh b/shell_scripts/start-config-service.sh
deleted file mode 100644
index 9ef3dac..0000000
--- a/shell_scripts/start-config-service.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-docker run -p "9999:9999" config-service
\ No newline at end of file
diff --git a/shell_scripts/start-services.sh b/shell_scripts/start-services.sh
index d08f265..d0e7b83 100644
--- a/shell_scripts/start-services.sh
+++ b/shell_scripts/start-services.sh
@@ -43,4 +43,4 @@ echo
 echo
 
 #Run jobapplication-service
-# ./jobapplicationservice/run.sh
+./jobapplicationservice/run.sh