commit 86e0740ff36b97ba98f1ed02f34bfb23d1b96262
author wsliwka <wojciech.sliwka@nokia.com> Wed Nov 20 13:20:08 2019 +0100
committer Morgan Richomme <morgan.richomme@orange.com> Mon Jan 27 15:04:55 2020 +0000
tree 9e579fd898dff23f8ebba24cae2e4b50340cf758
parent 6f2913b0129ea48becccfd55eeb93cbcb991f651

Latest changes to pnf simulator
- replace cpp bindings by python
- remove docker spotify plugin (no longer supported)
- create own image for netopeer (with all packages installed upfront)
Issue-ID: INT-1372

Signed-off-by: wsliwka <wojciech.sliwka@nokia.com>
Change-Id: I983c0eddf12fa589fbf3ad1ffbab2b36929c9ef0

test/mocks/pnfsimulator/netconfsimulator/pom.xml

diff --git a/test/mocks/pnfsimulator/netconfsimulator/pom.xml b/test/mocks/pnfsimulator/netconfsimulator/pom.xml
index d83c5b3..d5d7157 100644
--- a/test/mocks/pnfsimulator/netconfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/netconfsimulator/pom.xml
@@ -52,6 +52,7 @@
     <netopeer-saver-build-dir>${project.build.directory}/cmake</netopeer-saver-build-dir>
     <netopeer-saver-executable-dir>${netopeer-saver-build-dir}/bin</netopeer-saver-executable-dir>
     <skipITs>true</skipITs>
+    <proxy>""</proxy>
   </properties>
 
   <dependencies>
@@ -240,30 +241,38 @@
           </executions>
       </plugin>
       <plugin>
-        <groupId>com.spotify</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <configuration>
-          <imageName>${docker.registry}/${docker.image.name}</imageName>
-          <dockerDirectory>${project.basedir}/docker</dockerDirectory>
-          <forceTags>true</forceTags>
-          <registryUrl>${docker.registry}</registryUrl>
-          <imageTags>
-            <imageTag>latest</imageTag>
-          </imageTags>
-          <resources>
-            <resource>
-              <targetPath>${dependency.directory.name}</targetPath>
-              <directory>${dependency.directory.location}</directory>
-            </resource>
-            <resource>
-              <targetPath>/</targetPath>
-              <directory>${project.build.directory}</directory>
-              <include>${project.build.finalName}.jar</include>
-            </resource>
-          </resources>
-          <forceTags>true</forceTags>
-        </configuration>
+      <groupId>io.fabric8</groupId>
+      <artifactId>docker-maven-plugin</artifactId>
+      <version>0.31.0</version>
+      <executions>
+        <execution>
+          <id>build-images</id>
+          <goals>
+            <goal>push</goal>
+          </goals>
+        </execution>
+      </executions>
+      <configuration>
+        <images>
+          <image>
+            <name>${docker.registry}/${docker.image.name}</name>
+            <build>
+              <contextDir>${project.basedir}</contextDir>
+              <dockerFile>${project.basedir}/Dockerfile_app</dockerFile>
+            </build>
+          </image>
+          <image>
+            <name>${docker.registry}/netopeer</name>
+            <build>
+              <contextDir>${project.basedir}</contextDir>
+              <dockerFile>${project.basedir}/Dockerfile_netopeer</dockerFile>
+              <args>
+                <PROXY>${proxy}</PROXY>
+              </args>
+            </build>
+          </image>
+        </images>
+      </configuration>
       </plugin>
     </plugins>
   </build>