X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=activiti-extension%2Fsrc%2Fmain%2Fdocker%2Factiviti-docker-build_image.sh;h=51c523c39401f507cca354289f90f314c41683b1;hb=f55132f49d1dbe3bd24924a7edbcbd6ba6e16704;hp=7ed9f7fbb84a013a3828071b860191b79e653dc1;hpb=3cdda39ed8b4f10b9e0fcb9900acf09d426ccffc;p=vfc%2Fnfvo%2Fwfengine.git

diff --git a/activiti-extension/src/main/docker/activiti-docker-build_image.sh b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
index 7ed9f7f..51c523c 100644
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -16,8 +16,8 @@ IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 
 POM_DIR="../../../"
 cd ${POM_DIR}
-# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)
-# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)
+VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)
+#VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)
 echo "VERSION=${VERSION}"
 
 cd ${DOCKER_BUILD_DIR}
@@ -49,15 +49,17 @@ echo "CURLPROXY=${CURLPROXY}"
 rm -Rf activiti-5.2.0/
 rm -Rf apache-tomcat/
 rm -Rf temp/
+rm -Rf build/
 rm -Rf activiti-extension*.jar
 rm -Rf activiti-rest.war
-
+mkdir build
+cp -Rf ./Dockerfile ./build
 
 echo "download Tomcat 8.5.23"
 #curl "${CURLPROXY}" -m 300 -O -J -L  "http://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz"
 wget  "http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/8.5.23/tomcat-8.5.23.tar.gz"
 tar -zxf tomcat-8.5.23.tar.gz
-mv apache-tomcat-8.5.23 apache-tomcat
+mv apache-tomcat-8.5.23 ./build/apache-tomcat
 
 echo "download Activiti 5.22.0"
 wget "https://github.com/Activiti/Activiti/releases/download/activiti-5.22.0/activiti-5.22.0.zip"
@@ -80,12 +82,12 @@ cp -f activiti-extension*.jar ./temp/WEB-INF/lib/activiti-extension.jar
 echo "update activiti-rest.war"
 $JAVA_HOME/bin/jar -uvf activiti-rest.war -C ./temp/ ./
 #.  >/dev/null 2>&1  -C ./temp
-cp activiti-rest.war ./apache-tomcat/webapps/
-cp -Rf bin/* ./apache-tomcat/bin
+cp activiti-rest.war ./build/apache-tomcat/webapps/
+cp -Rf bin/* ./build/apache-tomcat/bin
 
 function build_image {
     echo "Start build docker image: ${IMAGE_NAME}"
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest ./build
 }
 
 function push_image {