Uncomment shell_scripts and adding jobapplication services to CI file

WolfAlexander · Mar 26, 2017 · 4902b9a · 4902b9a
1 parent b8889e9
commit 4902b9a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,4 +16,8 @@ script:
 
 script:
   - cd discoveryservice
+  - mvn test -B
+
+script:
+  - cd jobapplicationservice
   - mvn test -B
diff --git 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
@@ -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
@@ -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
+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
diff --git a/shell_scripts/start-config-service.sh b/shell_scripts/start-config-service.sh
diff --git 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