From 25c0056a7846168dbc5cc86615039ad8d1e9a35d Mon Sep 17 00:00:00 2001
From: Simon Hrabos <simon.hrabos@tieto.com>
Date: Fri, 20 Sep 2019 15:19:24 +0200
Subject: 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
---
 sidecar/tproxy-config/pom.xml                      | 105 +++++++++++++--------
 .../tproxy-config/src/main/assembly/descriptor.xml |  18 ++++
 sidecar/tproxy-config/src/main/docker/Dockerfile   |   2 +-
 3 files changed, 83 insertions(+), 42 deletions(-)
 create mode 100644 sidecar/tproxy-config/src/main/assembly/descriptor.xml

(limited to 'sidecar/tproxy-config')

diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml
index be88bb3..d734322 100644
--- a/sidecar/tproxy-config/pom.xml
+++ b/sidecar/tproxy-config/pom.xml
@@ -37,7 +37,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<version.io.fabric8.fabric8-maven-plugin>3.5.32</version.io.fabric8.fabric8-maven-plugin>
-		<docker.location>${basedir}/target</docker.location>
+		<docker.location>${project.basedir}/target/${project.artifactId}-${project.version}-build</docker.location>
 		<!-- <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> -->
 	</properties>
 
@@ -65,50 +65,73 @@
 					</execution>
 				</executions>
 			</plugin>
+			
+			<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>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
+                               	<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>
+                                	<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>${docker.location}</directory>
+                                                        					<outputDirectory>/${project.artifactId}</outputDirectory>
+                                                    					</fileSet>
+                                                				</fileSets>
+                                            				</inline>
+                                        			</assembly>
+                                    			</build>
+                                		</image>
+                            		</images>
+                        	</configuration>
 				<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>
-			<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>
+                             		<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>
 				<artifactId>maven-deploy-plugin</artifactId>
diff --git a/sidecar/tproxy-config/src/main/assembly/descriptor.xml b/sidecar/tproxy-config/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..b53f64e
--- /dev/null
+++ b/sidecar/tproxy-config/src/main/assembly/descriptor.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http_://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http_://www.__w3.org/2001/XMLSchema-instance"
+          xsi:SchemaLocation="http_://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http_://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>build</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/bin</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/sidecar/tproxy-config/src/main/docker/Dockerfile b/sidecar/tproxy-config/src/main/docker/Dockerfile
index b95cf74..4851a20 100644
--- a/sidecar/tproxy-config/src/main/docker/Dockerfile
+++ b/sidecar/tproxy-config/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 RUN apk add --update iptables curl bash
-COPY start.sh /start.sh
+COPY maven/tproxy-config/start.sh /start.sh
 RUN chmod 755 /start.sh
 #CMD start.sh
 ENTRYPOINT ["/start.sh"]
-- 
cgit 1.2.3-korg