Change docker images latest tag

Change 'latest' tag to 'frankfurt-latest' to avoid overriding master and frankfurt images

Issue-ID: AAF-1152
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I4100a4b98f50680fb33a699b9790ef9fa0d69d86

diff --git a/certService/pom.xml b/certService/pom.xml
index 2d1ca72..d098397 100644 (file)
--- a/certService/pom.xml
+++ b/certService/pom.xml
@@ -161,7 +161,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name}
+                                    <name>${docker-image.namespace}/${docker-image.name}:${docker-image.tag.latest}
                                     </name>
                                     <registry>${docker-image.registry}</registry>
                                     <build>

diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml
index 75a5a33..04683f8 100644 (file)
--- a/certServiceClient/pom.xml
+++ b/certServiceClient/pom.xml
@@ -103,7 +103,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${docker-image.namespace}/${docker-image.name}
+                                    <name>${docker-image.namespace}/${docker-image.name}:${docker-image.tag.latest}
                                     </name>
                                     <registry>${docker-image.registry}</registry>
                                     <build>

diff --git a/pom.xml b/pom.xml
index f797ef5..bf59e8a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
         <httpcomponents.version>4.5.6</httpcomponents.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <commons-io.version>2.6</commons-io.version>
-        <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
         <junit.version>5.5.2</junit.version>
         <mockito-junit-jupiter.version>2.17.0</mockito-junit-jupiter.version>
 
@@ -67,6 +66,7 @@
         <docker-image.namespace>onap</docker-image.namespace>
         <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
         <docker-image.latest>${project.version}</docker-image.latest>
+        <docker-image.tag.latest>frankfurt-latest</docker-image.tag.latest>
         <version>${project.version}</version>
         <docker.http_proxy/>