aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-03-07 09:52:15 -0800
committerPatrick Brady <pb071s@att.com>2017-03-07 13:08:23 -0800
commit9842d92e746861fc29f988ff91524153f2f631d4 (patch)
treeeba3120b80459e4ec3e83d5e9ca85d67ed78e1ea
parentdc7f56a2554812043b50174d9e8b0eeaa4483ae7 (diff)
Changing docker image tag names
Changing snapshot docker image tag to a STAGING version. Adding maven build timestamp to this image tag. Change-Id: I86112b37849ac9f2b4218bb006d06d59e293098f Signed-off-by: Patrick Brady <pb071s@att.com>
-rw-r--r--installation/appc/pom.xml8
-rw-r--r--version.properties2
2 files changed, 7 insertions, 3 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index d12296c..ee8242d 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -18,8 +18,12 @@
<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
<properties>
- <image.name>ecomp/appc-image</image.name>
+ <image.name>openecomp/appc-image</image.name>
<appc.version>${project.version}</appc.version>
+ <!--This version will be over-ridden by jenkins
+ injecting the version.properties variable file during docker build-->
+ <appc.docker.staging.version>0.0.1</appc.docker.staging.version>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
</properties>
@@ -200,7 +204,7 @@
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
+ <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag>
<tag>latest</tag>
</tags>
</build>
diff --git a/version.properties b/version.properties
index feea708..98ae468 100644
--- a/version.properties
+++ b/version.properties
@@ -11,4 +11,4 @@ base_version=${release_name}.${sprint_number}.${feature_revision}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
-
+appc.docker.staging.version=${base_version}