From 7fc7657363a2f8b6264337d5f8d8da5cd3744b9b Mon Sep 17 00:00:00 2001
From: "waqas.ikram" <waqas.ikram@est.tech>
Date: Wed, 17 Feb 2021 09:50:27 +0000
Subject: Changing image name back to so-monitoring

Change-Id: I40e1ad8e33342bd954bb1b45b3eb1daf569370c4
Issue-ID: SO-3486
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
---
 packages/docker/pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 846ce3f..9855b4e 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.so.so-admin-cockpit</groupId>
@@ -59,7 +59,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.31.0</version>
                 <configuration combine.self="override">
                     <verbose>true</verbose>
                     <apiVersion>1.23</apiVersion>
@@ -74,12 +73,12 @@
                             </build>
                         </image>
                         <image>
-                            <name>${docker.image.prefix}/so-admin-cockpit</name>
+                            <name>${docker.image.prefix}/so-monitoring</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                                 <tags>
-                                    <!--tag>${project.version}</tag-->
+                                    <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
                                     <tag>${project.docker.latesttag.version}</tag>
                                 </tags>
@@ -130,6 +129,9 @@
                             <goal>build</goal>
                             <goal>push</goal>
                         </goals>
+                        <configuration>
+                            <image>${docker.image.prefix}/so-monitoring</image>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -137,7 +139,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
-- 
cgit 1.2.3-korg