small, multi-platform (amd64, arm64) images

[aaf/cadi.git] / sidecar / fproxy / pom.xml

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 8875dd8..a84ee98 100644 (file)
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -27,6 +27,10 @@
                <version>2.1.14-SNAPSHOT</version>
        </parent>
 
+       <properties>
+                <fproxy.build.dir>${project.build.directory}/${project.artifactId}-build/</fproxy.build.dir>
+        </properties>
+
        <artifactId>fproxy</artifactId>
        <packaging>jar</packaging>
 
@@ -116,50 +120,78 @@
                                <configuration>
                                        <reuseForks>false</reuseForks>
                                        <forkCount>1</forkCount>
+                                       <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
                                </configuration>
                        </plugin>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>3.0.2</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-docker-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>target</outputDirectory>
-                                                       <overwrite>true</overwrite>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/docker</directory>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/bin/</directory>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
-                               <groupId>com.spotify</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.4.11</version>
-                               <configuration>
-                                       <verbose>true</verbose>
-                                       <serverId>docker-hub</serverId>
-                                       <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
-                                       <dockerDirectory>${docker.location}</dockerDirectory>
-                                       <imageTags>
-                                               <imageTag>latest</imageTag>
-                                       </imageTags>
-                                       <forceTags>true</forceTags>
-                               </configuration>
+                                       <groupId>io.fabric8</groupId>
+                               <artifactId>docker-maven-plugin</artifactId>
+                               <version>0.28.0</version>
+                               <configuration>
+                                       <verbose>true</verbose>
+                                       <apiVersion>${docker.apiVersion}</apiVersion>
+                                       <pullRegistry>${docker.pull.registry}</pullRegistry>
+                                       <pushRegistry>${docker.push.registry}</pushRegistry>
+                                       <serverId>docker-hub</serverId>
+                                       <dockerDirectory>${docker.location}</dockerDirectory>
+                                       <imageTags>
+                                               <imageTag>latest</imageTag>
+                                       </imageTags>
+                                       <forceTags>true</forceTags>
+                                       <images>
+                                               <image>
+                                                       <name>${docker.push.registry}/onap/${project.artifactId}</name>
+                                                       <build>
+                                                               <cleanup>try</cleanup>
+                                                                       <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+                                                               <tags>
+                                                                       <tag>latest</tag>
+                                                               </tags>
+                                                                       <assembly>
+                                                                       <inline>
+                                                                               <fileSets>
+                                                                                       <fileSet>
+                                                                                               <directory>${fproxy.build.dir}</directory>
+                                                                                               <outputDirectory>/${project.artifactId}</outputDirectory>
+                                                                                       </fileSet>
+                                                                               </fileSets>
+                                                                       </inline>
+                                                               </assembly>
+                                                       </build>
+                                               </image>
+                                       </images>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>generate-images</id>
+                                               <phase>install</phase>
+                                               <!--unbind default goal for this phase-->
+                                       </execution>
+                                       <execution>
+                                               <id>push-images</id>
+                                               <phase>deploy</phase>
+                                               <goals>
+                                                       <goal>push</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>