Merge "Policy types schemas should only be parsed once"
diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml
index 8554bf8..2ede17e 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 6185705..a77fd23 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 @@
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