From: Steven Wright <sw3588@att.com>
Date: Fri, 6 Apr 2018 13:19:37 +0000 (+0000)
Subject: Merge "Update docker tag convention"
X-Git-Tag: 2.0.0-ONAP~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e00c741bd98e35f71e4e83fff3de77c0bd2041d9;p=vvp%2Fcms.git

Merge "Update docker tag convention"
---

e00c741bd98e35f71e4e83fff3de77c0bd2041d9
diff --cc pom.xml
index 6c877bf,c04ebf7..37a1053
--- a/pom.xml
+++ b/pom.xml
@@@ -21,10 -21,9 +21,11 @@@
          <timestamp>${maven.build.timestamp}</timestamp>
          <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
          <!--docker-->
-         <docker.tag>${project.version}-${timestamp}</docker.tag>
+         <docker.snapshot.tag>${project.version}-SNAPSHOT-${timestamp}</docker.snapshot.tag>
+         <docker.staging.tag>${project.version}-STAGING-${timestamp}</docker.staging.tag>
          <docker.latest.tag>${project.version}-latest</docker.latest.tag>
 +        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 +        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
    </properties>
  
    <build>