Fix wfengine docker build issue

[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 67e9e7e..8a61f09 100644 (file)
--- a/activiti-extension/src/main/docker/activiti-docker-build_image.sh
+++ b/activiti-extension/src/main/docker/activiti-docker-build_image.sh
@@ -8,11 +8,13 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 # VERSION="1.0.0"
-VERSION="1.0.0-SNAPSHOT"
+DOCKER_VER="1.1.0"
+VERSION="${DOCKER_VER}-SNAPSHOT"
 PROJECT="vfc"
 IMAGE="wfengine-activiti"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
 IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
 
 if [ -z $NEXUS_REPOS_URL ]; then
   NEXUS_REPOS_URL="https://nexus.onap.org"
@@ -46,6 +48,7 @@ pwd
 #echo "0VERSION=${VERSION}"
 VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)
 echo "VERSION=${VERSION}"
+DOCKER_VER=${VERSION}
 
 cd ${DOCKER_BUILD_DIR}
 if [[ $VERSION != *-SNAPSHOT ]]; then
@@ -101,10 +104,26 @@ mv activiti-5.22.0/wars/activiti-rest.war .
 
 echo "download activiti-extension ${VERSION}"
 #curl "${CURLPROXY}" -m 600 -O -J -L  "${NEXUS_REPOS_URL}/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 "${NEXUS_REPOS_URL}/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 "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=snapshots&g=org.onap.vfc.nfvo.wfengine&a=activiti-extension&e=jar&v=${VERSION}-SNAPSHOT"
 wget -O activiti-extension.jar "${NEXUS_REPOS_URL}/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 
+cp -f swagger.json ./temp/ 
+
+
+echo "download jackson-annotations 2.5.1"
+wget -O jackson-annotations-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-annotations&e=jar&v=2.5.1"
+cp -f jackson-annotations-2.2.3.jar ./temp/WEB-INF/lib/jackson-annotations-2.2.3.jar
+
+echo "download jackson-core 2.5.1"
+wget -O jackson-core-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/redirect?r=central&g=com.fasterxml.jackson.core&a=jackson-core&e=jar&v=2.5.1"
+cp -f jackson-core-2.2.3.jar ./temp/WEB-INF/lib/jackson-core-2.2.3.jar
+
+echo "download jackson-databind 2.5.1"
+wget -O jackson-databind-2.2.3.jar "${NEXUS_REPOS_URL}/service/local/artifact/maven/content?r=central&g=com.fasterxml.jackson.core&a=jackson-databind&e=jar&v=2.5.1"
+cp -f jackson-databind-2.2.3.jar ./temp/WEB-INF/lib/jackson-databind-2.2.3.jar
 
 echo "update activiti-rest.war"
 jarcmd=$(whereis jar | grep ^jar |awk '{print $2}')
@@ -130,19 +149,30 @@ 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 ./build
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest ./build
+}
+
+function push_image_tag {
+    TAG_NAME=$1
+    echo "Start push ${TAG_NAME}"
+    docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+    docker push ${TAG_NAME}
 }
 
 function push_image {
-    echo "Start push docker image: ${IMAGE_NAME}"
-    docker push ${IMAGE_NAME}:${VERSION}
+    echo "Start push ${IMAGE_NAME}:latest"
     docker push ${IMAGE_NAME}:latest
+    
+    push_image_tag ${IMAGE_NAME}:${DOCKER_VER}-SNAPSHOT-latest
+    push_image_tag ${IMAGE_NAME}:${DOCKER_VER}-STAGING-latest
+    push_image_tag ${IMAGE_NAME}:${DOCKER_VER}-STAGING-${TIMESTAMP}
 }
 
 build_image