aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-02-22 02:00:19 +0000
committerCarsten Lund <lund@research.att.com>2017-02-22 02:00:19 +0000
commitbf53d480475f43de0c11864760c226efeb991dca (patch)
tree126e15b2b2ba401050cf90a3946f231a70a73ee6
parentcc0805ae97200c365c6d6c3357593cd3873a092e (diff)
Fixed version issue in docker build script
Change-Id: Ifcada0fb72c5438bdd86cf47e3dfc9aa5b829032 Signed-off-by: Carsten Lund <lund@research.att.com>
-rwxr-xr-xdocker-build.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker-build.sh b/docker-build.sh
index ad11375..8b6df1d 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -34,10 +34,11 @@ DCM_DIR="${STAGE}/opt/app/manager"
unzip -qo -d "${DCM_DIR}" "${DCM_AR}"
# unarchive the collector
-AR=${WORKSPACE}/target/OpenVESCollector-1.0.0-bundle.tar.gz
+VERSION=$(xpath -e '/project/version/text()' pom.xml)
+AR=${WORKSPACE}/target/OpenVESCollector-${VERSION}-bundle.tar.gz
APP_DIR=${STAGE}/opt/app/SEC
-[ -d ${STAGE}/opt/app/OpenVESCollector-1.0.0 ] && rm -rf ${STAGE}/opt/app/OpenVESCollector-1.0.0
+[ -d ${STAGE}/opt/app/OpenVESCollector-${VERSION} ] && rm -rf ${STAGE}/opt/app/OpenVESCollector-$VERSION
[ ! -f $APP_DIR ] && mkdir -p ${APP_DIR}