Fix the docker build error for vfc-nfvo-wfengine

[vfc/nfvo/wfengine.git] / activiti-extension / src / main / docker / activiti-docker-build_image.sh

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 70b715e..0e8d9d6 100644 (file)
--- 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,31 @@ 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)
+
+mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')
+if [[ 1$mvncmd != 1 ]]; then
+  echo $mvncmd
+elif [ $MVN ]; then
+  echo MVN
+  mvncmd=$MVN
+elif [ $M2_HOME ]; then
+  echo M2_HOME
+  mvncmd=$M2_HOME/bin/mvn
+elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then
+  echo /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn
+  mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"
+elif [ -f "/usr/share/maven/bin/mvn" ]; then
+  mvncmd="/usr/share/maven/bin/mvn"
+else
+  echo "Maven is not installed, mvncmd=$mvncmd"
+  exit 1
+fi
+echo "mvncmd=${mvncmd}"
+
+pwd
+#VERSION=$(printf 'VER\t${project.version}\n0'|$mvncmd help:evaluate)
+#echo "0VERSION=${VERSION}"
+VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
 echo "VERSION=${VERSION}"
 
 cd ${DOCKER_BUILD_DIR}
@@ -46,11 +69,20 @@ if [ $https_proxy ]; then
 fi
 echo "CURLPROXY=${CURLPROXY}"
 
-echo "download Tomcat 8.5.20"
+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://mirrors.shuosc.org/apache/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz"
-tar -zxf apache-tomcat-8.5.20.tar.gz
-mv apache-tomcat-8.5.20 apache-tomcat
+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 ./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"
@@ -59,24 +91,37 @@ rm -Rf ./activiti-5.22.0/
 #sudo apt-get install p7zip-full
 #7za x activiti-5.22.0.zip
 
-unzip -o -q activiti-5.22.0.zip
-#unzip -o -q activiti-5.22.0.zip "activiti-5.22.0/wars/activiti-rest.war" -d ./
+#unzip -o -q activiti-5.22.0.zip
+unzip -o -q activiti-5.22.0.zip "activiti-5.22.0/wars/activiti-rest.war" -d ./
 mv activiti-5.22.0/wars/activiti-rest.war .
 
 echo "download activiti-extension ${VERSION}"
 #curl "${CURLPROXY}" -m 600 -O -J -L  "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
-wget --output-file=activiti-extension.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
+wget -O activiti-extension.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}"
 rm -Rf ./temp/
 mkdir -p ./temp/WEB-INF/lib/
 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
-cp activiti-rest.war ./apache-tomcat/webapps/
+jarcmd=$(whereis jar | grep ^jar |awk '{print $2}')
+if [ 1$jarcmd != 1 ]; then
+  echo $jarcmd
+elif [ $JAVA_HOME ]; then
+  jarcmd=$JAVA_HOME/bin/jar
+elif [ -f "/usr/lib/jvm/java-8-openjdk-amd64/bin/jar" ]; then
+  jarcmd="/usr/lib/jvm/java-8-openjdk-amd64/bin/jar"
+else
+  exit 1
+fi
+echo "jarcmd=${jarcmd}"
+$jarcmd -uvf activiti-rest.war -C ./temp/ ./
+#.  >/dev/null 2>&1  -C ./temp
+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 {
@@ -86,4 +131,4 @@ function push_image {
 }
 
 build_image
-#push_image
+push_image