From be48fc594aa032b6d152b79ecfb0e530092d91a1 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Tue, 26 Jul 2016 17:03:24 +0200
Subject: [PATCH] use environment variable to define workspace directory
---
captain.yml | 8 ++++----
captain_build.sh | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/captain.yml b/captain.yml
index 966005776..f5f137b5c 100644
--- a/captain.yml
+++ b/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
diff --git a/captain_build.sh b/captain_build.sh
index 7e11462e1..b524f3458 100755
--- a/captain_build.sh
+++ b/captain_build.sh
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
+export WORKSPACE=$(pwd)
captain build
--
GitLab