aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2017-03-24 15:26:47 +0000
committerVenkata Harish K Kajur <vk250x@att.com>2017-03-24 15:27:36 +0000
commit94f36ddfa3c523eba23448511621233a8af7ce34 (patch)
tree7edd06d45a671c7e7c0058001254d8f3431fb395
parent16573359029ab1260a6ba07b9cbbbbbb5698d3b4 (diff)
Update pom for docker push plugin
Change-Id: I59920d9267eb9a3c4a844ae49346347bb0b22964 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
-rw-r--r--.gitignore1
-rw-r--r--.gitreview1
-rw-r--r--ajsc-aai/pom.xml6
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 023bd8c..4bf6b30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.settings
.project
.classpath
+.gitreview
target/
**/logs/
bundleconfig-local/etc/auth/aai-client-cert.p12
diff --git a/.gitreview b/.gitreview
index 8cb2236..ad2ddfb 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=gerrit.openecomp.org
port=29418
project=aai/aai-service.git
+defaultbranch=release-1.0.0
diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml
index 5479044..b1a120d 100644
--- a/ajsc-aai/pom.xml
+++ b/ajsc-aai/pom.xml
@@ -436,9 +436,11 @@
<imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
<dockerDirectory>${dockerLocation}</dockerDirectory>
- <serverId>docker-hub</serverId>
+ <serverId>${docker.push.registry}</serverId>
<imageTags>
- <imageTag>latest</imageTag>
+ <imageTag>${docker.image.version}-SNAPSHOT-${maven.build.timestamp}</imageTag>
+ <imageTag>${docker.image.version}-STAGING-${maven.build.timestamp}</imageTag>
+ <imageTag>1.0-STAGING-latest</imageTag>
</imageTags>
<forceTags>true</forceTags>
</configuration>