diff options
| author |   Simon Hrabos <simon.hrabos@tieto.com> | 2019-09-20 15:19:24 +0200 |
|---|---|---|
| committer | Simon Hrabos <simon.hrabos@tieto.com> | 2019-09-24 10:00:35 +0200 |
| commit | 25c0056a7846168dbc5cc86615039ad8d1e9a35d (patch) | |
| tree | 77f0e14a4d5c240a860dd9a7e1499e59341305e6 /sidecar/fproxy/pom.xml | |
| parent | c932b38f09dd98b8f93d6b0dfac0d556e0126138 (diff) | |
small, multi-platform (amd64, arm64) images
Modify fproxy, rproxy and tproxy-config docker container image due to arm64 compatibility
Issue-ID: INT-1174
Issue-ID: INT-1175
Issue-ID: INT-1176
Signed-off-by: Simon Hrabos <simon.hrabos@tieto.com>
Change-Id: Ibbf9e1d15bea9ebb1b82ff50c8671927c68be2ed
Diffstat (limited to 'sidecar/fproxy/pom.xml')
| -rw-r--r-- | sidecar/fproxy/pom.xml | 112 |
1 files changed, 72 insertions, 40 deletions
diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml index 8875dd8..a84ee98 100644 --- 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> |