Align to Docker Standard Tag Format

Issue-ID: CIMAN-132
Change-Id: I5dedcb92ba8c2aae0bfcaa63382beaa4f21587b7
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>

diff --git a/build4basedocker.sh b/build4basedocker.sh
index a0b509f..04f7228 100644 (file)
--- a/build4basedocker.sh
+++ b/build4basedocker.sh
@@ -32,7 +32,7 @@ DOCKER_IMAGE_NAME=msb_base
 DOCKER_LATEST_VERSION=latest
 DOCKER_RELEASE_VERSION=1.0.0
 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/src/main/basedocker/* ${RELEASE_DIR}
 cp  $RUNHOME/ci/build_docker_image.sh ${RELEASE_DIR}

diff --git a/build4docker.sh b/build4docker.sh
index 2498a54..0bf110e 100644 (file)
--- a/build4docker.sh
+++ b/build4docker.sh
@@ -38,7 +38,7 @@ DOCKER_IMAGE_NAME=msb_apigateway
 DOCKER_LATEST_VERSION=latest
 DOCKER_RELEASE_VERSION=1.2.1
 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}
@@ -55,7 +55,7 @@ docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_V
 ./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}