Fix docker build error

[vfc/nfvo/driver/vnfm/svnfm.git] / nokiav2 / deployment / src / main / resources / build_image.sh

diff --git a/nokiav2/deployment/src/main/resources/build_image.sh b/nokiav2/deployment/src/main/resources/build_image.sh
index 358048d..0465374 100755 (executable)
--- a/nokiav2/deployment/src/main/resources/build_image.sh
+++ b/nokiav2/deployment/src/main/resources/build_image.sh
@@ -29,14 +29,18 @@ DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
 echo "----- Build directory ${DOCKER_BUILD_DIR}"
 cd ${DOCKER_BUILD_DIR}
 
-VERSION=`xmlstarlet sel -t -v "/_:project/_:version" ../../../pom.xml | sed 's/-SNAPSHOT//g'`
+#VERSION=`xmlstarlet sel -t -v "/_:project/_:version" ../../../pom.xml | sed 's/-SNAPSHOT//g'`
+VERSION=`xmlstarlet sel -t -v "/_:project/_:version" ../../../pom.xml`
 echo "------ Detected version: $VERSION"
 
 PROJECT="vfc"
 IMAGE="nfvo/svnfm/nokiav2"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 ORG="onap"
-BUILD_ARGS="--no-cache --squash"
+BUILD_ARGS="--no-cache"
+# it looks like that ONAP jenkins does not support squash
+#BUILD_ARGS="--no-cache --squash"
+
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 TIMESTAMP=$(date +"%Y%m%dT%H%M%S")