From 5de4c89141c0b14c3c23f3d108e690225d5a5cf3 Mon Sep 17 00:00:00 2001
From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Tue, 4 Feb 2020 10:19:43 +0100
Subject: [PATCH] Step-up A1 controller docker image version

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

diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
index 9e6b65a8..660baaa1 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
@@ -46,6 +46,7 @@
     <properties>
         <image.name>onap/sdnc-aaf-image</image.name>
         <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
+	<standalone.image.version>1.7.4-SNAPSHOT</standalone.image.version>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <sdnc.northbound.version>1.7.3-SNAPSHOT</sdnc.northbound.version>
@@ -133,13 +134,13 @@
                      <configuration>
                       <images>
                        <image>
-                        <name>${standalone.image.name}:${project.version}</name>
+                        <name>${standalone.image.name}:${standalone.image.version}</name>
                         <build>
                          <cleanup>try</cleanup>
                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                          <dockerFile>standalone.Dockerfile</dockerFile>
                          <tags>
-                             <tag>${project.version}</tag>
+                             <tag>${standalone.image.version}</tag>
                          </tags>
                         </build>
                        </image>
@@ -157,13 +158,13 @@
                        <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                        <images>
                         <image>
-                         <name>${standalone.image.name}:${project.version}</name>
+                         <name>${standalone.image.name}:${standalone.image.version}</name>
                          <build>
                           <cleanup>try</cleanup>
                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                           <dockerFile>standalone.Dockerfile</dockerFile>
                           <tags>
-                             <tag>${project.version}</tag>
+                             <tag>${standalone.image.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 a77fd233..acf15a13 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:1.7.3-SNAPSHOT
+    image: o-ran-sc/nonrtric-a1-controller:1.7.4-SNAPSHOT
     depends_on :
       - db
     container_name: a1-controller-container
-- 
2.16.6