From: Henrik Andersson <henrik.b.andersson@est.tech>
Date: Thu, 19 Dec 2019 14:52:20 +0000 (+0000)
Subject: Merge "Modify pom to push policy agent image to nexus"
X-Git-Tag: 1.0.1~64
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=766e6af8d8ddf946ad5cb45a560b040e4857065e;hp=cd9e9862fa9a5898f3595b397686861749f72953;p=nonrtric.git

Merge "Modify pom to push policy agent image to nexus"
---

diff --git a/near-rt-ric-simulator/common/test_env.sh b/near-rt-ric-simulator/common/test_env.sh
index 7861940d..0ea885b3 100755
--- a/near-rt-ric-simulator/common/test_env.sh
+++ b/near-rt-ric-simulator/common/test_env.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Local image and tag, shall point to locally built image (non-nexus path)
-export POLICY_AGENT_LOCAL_IMAGE=oransc/policy-agent
+export POLICY_AGENT_LOCAL_IMAGE=o-ran-sc/policy-agent
 
 
 # Common env var for auto-test.
diff --git a/policy-agent/Dockerfile b/policy-agent/Dockerfile
index 51a4dd3e..f28414ce 100644
--- a/policy-agent/Dockerfile
+++ b/policy-agent/Dockerfile
@@ -17,7 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #
-FROM adoptopenjdk/openjdk11:latest
+FROM openjdk:11-jre-slim
 
 WORKDIR /opt/app/policy-agent
 RUN mkdir -p /var/log/policy-agent
diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 0969f149..6ac79780 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -56,7 +56,7 @@
         <junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
         <formatter-maven-plugin.version>2.8.1</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
-        <dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
+        <docker-maven-plugin>0.30.0</docker-maven-plugin>
     </properties>
     <dependencies>
         <dependency>
@@ -220,16 +220,35 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>${dockerfile-maven-plugin.version}</version>
-                <configuration>
-                    <repository>oransc/policy-agent</repository>
-                    <tag>${project.version}</tag>
-                    <buildArgs>
-                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                </configuration>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker-maven-plugin}</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>push-policy-agent-image</id>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
+                            <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
+                            <images>
+                                <image>
+                                    <name>o-ran-sc/policy-agent:${project.version}</name>
+                                    <build>
+                                        <contextDir>${basedir}</contextDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>