X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=build4docker.sh;h=4974bcd166780b4eb3c7ad3f7397de193910c3fd;hb=f5d2b5f6f30f25d8b06426f7144c3e623e22595d;hp=44f6aca5f25ff74d591c5782125f8374d524b6b7;hpb=78c426e548f473ff58268c82c26a0bf4906e13be;p=msb%2Fapigateway.git

diff --git a/build4docker.sh b/build4docker.sh
index 44f6aca..4974bcd 100644
--- a/build4docker.sh
+++ b/build4docker.sh
@@ -36,9 +36,9 @@ mkdir  $RELEASE_DIR -p
 DOCKER_RUN_NAME=msb_apigateway
 DOCKER_IMAGE_NAME=msb_apigateway
 DOCKER_LATEST_VERSION=latest
-DOCKER_RELEASE_VERSION=1.2.0
+DOCKER_RELEASE_VERSION=1.2.6
 DOCKER_REPOSITORY=nexus3.onap.org:10003
-TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+TIMESTAMP=$(date +"%Y%m%dT%H%M%SZ")
 
 cp -r $RUNHOME/distributions/msb-apigateway/target/version/* ${RELEASE_DIR}
 cp  $RUNHOME/ci/build_docker_image.sh ${RELEASE_DIR}
@@ -48,14 +48,14 @@ chmod 777 build_docker_image.sh
 
 
 docker rm -f ${DOCKER_RUN_NAME}
-docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}
-docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-STAGING-latest
-docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-SNAPSHOT-latest
+docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}
+docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-STAGING-latest
+docker rmi --force ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION}-SNAPSHOT-latest
 
 ./build_docker_image.sh -n=${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME} -v=${DOCKER_LATEST_VERSION} -d=./docker
 
 docker run -d --net=host  --name ${DOCKER_RUN_NAME} ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}
-docker ps |grep ${DOCKER_RUN_NAME} 
+docker ps |grep ${DOCKER_RUN_NAME}
 
 echo "Pushing ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}"
 docker push ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_LATEST_VERSION}