diff options
| -rw-r--r-- | installation/appc/pom.xml | 8 | ||||
| -rw-r--r-- | version.properties | 2 |
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} |