diff --git a/.gitignore b/.gitignore index f8b1a942c5e474ed9e57fe1f2ecb144a3fbc44af..9c7122abfa7caef476a8ff05914783b4a0ec64dd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target* .DS_Store .m2 +*.jar diff --git a/captain.yml b/captain.yml index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c53ffba9fd181837301deca223828ada5d587d94 100644 --- a/captain.yml +++ b/captain.yml @@ -0,0 +1,26 @@ +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 + - cp $(pwd)/target/backend-services-DOCKER_BUILD.jar $(pwd)/src/docker/run/ + - 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/ + - docker run -d --name db -p 5432:5432 -v $(pwd)/pgdata:/var/lib/postgresql/data/pgdata -e "POSTGRES_USER=postgres" -e "PGDATA=/var/lib/postgresql/data/pgdata" postgres:9.5.3 + post: + - docker run --rm --name backend -v $(pwd)/config:/config hbpmip/backend echo 'backend is running' + - docker stop db && docker rm -f db + - rm -r $(pwd)/src/docker/run/target/ + - echo 'Finished building backend' + test: + - tests.sh \ No newline at end of file diff --git a/config/application.yml b/config/application.yml index 05b35323155e50d61963cbe6b4480f53a40c73e2..3b704d69a861e51fae987b7e206449f01eba66c9 100644 --- a/config/application.yml +++ b/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: