From a79bf9c0271fd1981aa8a6b31360f75f070bec09 Mon Sep 17 00:00:00 2001
From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Thu, 21 Nov 2019 17:23:24 +0100
Subject: [PATCH] Change tag of A1 controller docker image

Change-Id: I4b5f0d9155d3fe033d78b89cb161b3f2e48ecf65
Issue-ID: NONRTRIC-70
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---
 sdnc-a1-controller/oam/installation/sdnc/pom.xml             | 12 ++++--------
 .../oam/installation/src/main/yaml/docker-compose.yml        |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
index 8554bf84..2ede17ed 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
@@ -156,15 +156,13 @@
                      <configuration>
                       <images>
                        <image>
-                        <name>${standalone.image.name}</name>
+                        <name>${standalone.image.name}:${project.version}</name>
                         <build>
                          <cleanup>try</cleanup>
                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                          <dockerFile>standalone.Dockerfile</dockerFile>
                          <tags>
-                             <tag>${project.docker.latestminortag.version}</tag>
-                             <tag>${project.docker.latestfulltag.version}</tag>
-                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                             <tag>${project.version}</tag>
                          </tags>
                         </build>
                        </image>
@@ -182,15 +180,13 @@
                        <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                        <images>
                         <image>
-                         <name>${standalone.image.name}</name>
+                         <name>${standalone.image.name}:${project.version}</name>
                          <build>
                           <cleanup>try</cleanup>
                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                           <dockerFile>standalone.Dockerfile</dockerFile>
                           <tags>
-                             <tag>${project.docker.latestminortag.version}</tag>
-                             <tag>${project.docker.latestfulltag.version}</tag>
-                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                             <tag>${project.version}</tag>
                           </tags>
                          </build>
                         </image>
diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
index 61857050..a77fd233 100644
--- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
+++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
@@ -38,7 +38,7 @@ services:
         max-file: "5"
 
   a1-controller:
-    image: o-ran-sc/nonrtric-a1-controller:latest
+    image: o-ran-sc/nonrtric-a1-controller:1.7.3-SNAPSHOT
     depends_on :
       - db
     container_name: a1-controller-container
-- 
2.16.6