Merge branch 'captainify' into 'master'

Captainify



See merge request !13

.gitignore

@@ -3,3 +3,4 @@
 target*
 .DS_Store
 .m2
+*.jar

captain.yml

+backend-build:
+  build: ./src/docker/build/Dockerfile
+  image: hbpmip/backend-build
+  pre:
+    - echo 'Building backend-build'
+  post:
+    - docker run --rm -v $(pwd):/opt/portal/ -v $(pwd)/.m2:/root/.m2/ hbpmip/backend-build
+    - echo 'Finished building backend-build'
+  test:
+    - tests.sh
+
+backend:
+  build: ./src/docker/run/Dockerfile
+  image: hbpmip/backend
+  pre:
+    - echo 'Building backend'
+    - cp -r $(pwd)/target $(pwd)/src/docker/run/target/
+  post:
+    - rm -r $(pwd)/src/docker/run/target/
+    - echo 'Finished building backend'
+  test:
+    - tests.sh
\ No newline at end of file

config/application.yml

@@ -2,7 +2,7 @@
 
 spring:
   datasource:
-    url: jdbc:postgresql://db:5432/postgres
+    url: jdbc:postgresql://172.22.0.1:5432/postgres
     username: postgres
     password: pass
     driver-class-name: org.postgresql.Driver
@@ -40,9 +40,9 @@ server:
     timeout: 2592000
 
 workflow:
-  experimentUrl: http://dockerhost:8087/experiment
-  listMethodsUrl: http://dockerhost:8087/list-methods
-  miningMipUrl: http://dockerhost:8087/mining
+  experimentUrl: http://172.22.0.1:8087/experiment
+  listMethodsUrl: http://172.22.0.1:8087/list-methods
+  miningMipUrl: http://172.22.0.1:8087/mining
   miningExaremeUrl: http://hbps2.chuv.ch:9090/mining/query
 
 frontend:

src/docker/run/Dockerfile

-FROM frolvlad/alpine-oraclejdk8:slim
+FROM java:openjdk-8u92-jdk-alpine
 
 VOLUME /config