1 files changed, 16 insertions, 6 deletions
diff --git a/docker_build.sh b/docker_build.sh
index b21a6955..51a6bb1d 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -2,12 +2,13 @@
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
 
-
 DOCKER_REPOSITORY=nexus3.openecomp.org:10003
-DOCKER_VERSION=latest
+MVN_VERSION=$(cat target/version)
+TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
 
-export DOCKER_REPOSITORY
-export DOCKER_VERSION
+echo $DOCKER_REPOSITORY
+echo $MVN_VERSION
+echo $TIMESTAMP
 
 cp policy-pe/* target/policy-pe/
 cp policy-drools/* target/policy-drools/
@@ -16,11 +17,20 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
     echo "Building $image"
     mkdir -p target/$image
     cp $image/* target/$image
-    docker build --quiet --tag openecomp/policy/$image:${DOCKER_VERSION} --tag ${DOCKER_REPOSITORY}/openecomp/policy/$image:${DOCKER_VERSION} target/$image
+
+    TAGS="--tag openecomp/policy/${image}:latest"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:latest"
+    TAGS="${TAGS} --tag openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
+
+    echo $TAGS
+
+    docker build --quiet $TAGS target/$image
     docker images
 done
 
 for image in policy-nexus policy-db policy-drools policy-pe; do
     echo "Pushing $image"
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${DOCKER_VERSION}
+    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:latest
+    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-${TIMESTAMP}
 done