Merge branch 'ci_adaptations' into 'master'

Ci adaptations



See merge request !23

README.md

@@ -13,7 +13,7 @@ This is the MIP backend.
 
 ## Usage in building environment
 
-* Build a versioned image: `./captain_build.sh` or `captain build`
+* Build a versioned image: `./captain_build.sh` (only if `$WORKSPACE=$(pwd)`) or `export WORKSPACE=<path-to-workspace> && captain build`
 * Build and test an image: `./captain_test.sh` or `captain test`
 * Run the latest image with a non-persistent postgres (only use this for testing purpose): `./captain_run.sh`
 

captain.yml

@@ -4,7 +4,7 @@ portal-backend-build:
   pre:
     - echo 'Building portal-backend-build'
   post:
-    - docker run --rm -v $(pwd):/opt/portal/ -v $(pwd)/.m2:/root/.m2/ hbpmip/portal-backend-build
+    - docker run --rm -v $WORKSPACE:/opt/portal/ -v $WORKSPACE/.m2:/root/.m2/ hbpmip/portal-backend-build
     - echo 'Finished building portal-backend-build'
   test:
     - ./tests/test-build.sh
@@ -17,10 +17,10 @@ portal-backend:
     - cp -r $(pwd)/config/ $(pwd)/src/docker/run/config/
     - cp -r $(pwd)/target/ $(pwd)/src/docker/run/target/
   post:
-    - rm -rf $(pwd)/src/docker/run/target/
-    - rm -rf $(pwd)/src/docker/run/config/
+    - rm -rf $WORKSPACE/src/docker/run/target/
+    - rm -rf $WORKSPACE/src/docker/run/config/
     - echo 'Finished building portal-backend'
   test:
     - ./tests/pre-test-run.sh
     - ./tests/test-run.sh
-    - ./tests/post-test-run.sh
\ No newline at end of file
+    - ./tests/post-test-run.sh

captain_build.sh

 #!/usr/bin/env bash
 
+export WORKSPACE=$(pwd)
 captain build