From bf53d480475f43de0c11864760c226efeb991dca Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Wed, 22 Feb 2017 02:00:19 +0000 Subject: Fixed version issue in docker build script Change-Id: Ifcada0fb72c5438bdd86cf47e3dfc9aa5b829032 Signed-off-by: Carsten Lund --- docker-build.sh | 5 +++-- 1 file 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} -- cgit 1.2.3-korg