From 4ce63773ba1cee107dd8fb62214a5867ed650857 Mon Sep 17 00:00:00 2001
From: Aaron Zielstorff <aaron.zi@web.de>
Date: Fri, 4 Oct 2024 09:42:34 +0200
Subject: [PATCH] Updates docker image creation

---
 databridge.component/Dockerfile |   4 +-
 databridge.component/pom.xml    |  72 ++++++++-------------
 pom.xml                         | 110 +++++++++++++++++++++++++++++++-
 3 files changed, 136 insertions(+), 50 deletions(-)

diff --git a/databridge.component/Dockerfile b/databridge.component/Dockerfile
index d62547f8..4a73932d 100644
--- a/databridge.component/Dockerfile
+++ b/databridge.component/Dockerfile
@@ -4,9 +4,9 @@ FROM openjdk:11-slim-bullseye
 RUN apt update && apt install -y wget && apt clean
 
 # Copy built jar to image using the jar name specified in the pom.xml (JAR_FILE)
-ARG JAR_FILE
+ARG JAR_FILE=target/*.jar
 
-COPY target/${JAR_FILE} /usr/share/databridgeExecutable.jar
+COPY ${JAR_FILE} /usr/share/databridgeExecutable.jar
 COPY target/lib /usr/share/lib
 
 # Expose this port for health check 
diff --git a/databridge.component/pom.xml b/databridge.component/pom.xml
index 00f83492..f79ba0ea 100644
--- a/databridge.component/pom.xml
+++ b/databridge.component/pom.xml
@@ -18,6 +18,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<basyx.databridge.executable>org.eclipse.digitaltwin.basyx.databridge.component.DataBridgeExecutable</basyx.databridge.executable>
+		<docker.image.name>databridge</docker.image.name>
 	</properties>
 
 	<!-- Define additional plugins that are not included by default -->
@@ -58,13 +59,6 @@
 					<excludes>
 						<exclude>**/logback.xml</exclude>
 					</excludes>
-					<executions>
-						<execution>
-							<goals>
-								<goal>test-jar</goal>
-							</goals>
-						</execution>
-					</executions>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -87,106 +81,106 @@
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-paho</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-aas</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-jsonata</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-activemq</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-hono</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-httppolling</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-kafka</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-opcua</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-sql</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-timer</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-jsonjackson</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.camel-plc4x</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.examples.plc4x-jsonata-aas</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.examples.aas-jsonata-mqtt</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.examples.sql-jsonata-aas</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.examples.aas-jsonata-http</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>databridge.examples.httpserver</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 
 		<dependency>
@@ -294,7 +288,7 @@
 		<profile>
 			<!-- "Docker" profile - do not build & install docker images by default 
 				Run "mvn install -Pdocker" in order to include docker -->
-			<id>docker</id>
+			<id>docker-push</id>
 			<build>
 				<plugins>
 					<!-- Read maven properties from file -->
@@ -340,28 +334,12 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.43.2</version>
-						<configuration>
-							<images>
-								<image>
-									<name>${BASYX_IMAGE_NAME}:${BASYX_IMAGE_TAG}</name>
-									<build>
-										<contextDir>${project.basedir}</contextDir>
-										<args>
-											<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-										</args>
-									</build>
-								</image>
-							</images>
-							<verbose>true</verbose>
-						</configuration>
 						<executions>
 							<execution>
-								<id>docker:build</id>
-								<phase>package</phase>
-								<goals>
-									<goal>build</goal>
-								</goals>
+								<id>build-docker</id>
+							</execution>
+							<execution>
+								<id>push-docker</id>
 							</execution>
 						</executions>
 					</plugin>
@@ -376,8 +354,8 @@
 							<detachedMode>true</detachedMode>
 							<envFile>${project.basedir}/src/test/resources/.env</envFile>
 							<envVars>
-								<BASYX_IMAGE_TAG>${BASYX_IMAGE_TAG}</BASYX_IMAGE_TAG>
-								<BASYX_IMAGE_NAME>${BASYX_IMAGE_NAME}</BASYX_IMAGE_NAME>
+								<BASYX_IMAGE_TAG>${docker.image.tag}</BASYX_IMAGE_TAG>
+								<BASYX_IMAGE_NAME>${docker.namespace}/${docker.image.name}</BASYX_IMAGE_NAME>
 								<VOLUME_MAPPING>${project.basedir}/src/test/resources/mqtt</VOLUME_MAPPING>
 							</envVars>
 						</configuration>
diff --git a/pom.xml b/pom.xml
index 3499f913..8e250375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 			<url>https://opensource.org/licenses/MIT</url>
 		</license>
 	</licenses>
+
 	<developers>
 		<developer>
 			<organization>Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V.</organization>
@@ -41,11 +42,17 @@
 			<email>frank.schnicke@iese.fraunhofer.de</email>
 		</developer>
 	</developers>
+
 	<properties>
 		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<revision>0.0.1-SNAPSHOT</revision>
+		<revision>1.0.0-SNAPSHOT</revision>
+		<docker.provenance />
+		<docker.namespace>eclipsebasyx</docker.namespace>
+		<docker.image.name>NOT_DEFINED_IN_MODULE</docker.image.name>
+		<docker.image.tag>${revision}</docker.image.tag>
+		<docker.target.platforms>linux/amd64, linux/arm64/v8</docker.target.platforms>
 		<camel.version>3.21.0</camel.version>
 	</properties>
 
@@ -76,6 +83,70 @@
 				</executions>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>io.fabric8</groupId>
+					<artifactId>docker-maven-plugin</artifactId>
+					<version>0.45.1</version>
+					<configuration>
+						<images>
+							<image>
+								<name>
+									${docker.namespace}/${docker.image.name}:${docker.image.tag}</name>
+								<registry>docker.io</registry>
+								<build>
+									<contextDir>${project.basedir}</contextDir>
+									<args>
+									</args>
+									<labels>
+										<maven.version>${project.version}</maven.version>
+										<maven.build.timestamp>
+											${maven.build.timestamp}</maven.build.timestamp>
+									</labels>
+									<noCache>true</noCache>
+									<buildx>
+										<platforms>
+											${docker.target.platforms}
+										</platforms>
+									</buildx>
+								</build>
+							</image>
+						</images>
+						<verbose>true</verbose>
+					</configuration>
+					<executions>
+						<execution>
+							<id>build-docker</id>
+							<phase>package</phase>
+							<goals>
+								<goal>build</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>push-docker</id>
+							<phase>deploy</phase>
+							<goals>
+								<goal>build</goal>
+								<goal>push</goal>
+							</goals>
+							<configuration>
+								<images>
+									<image>
+										<build>
+											<buildx>
+												<platforms>
+													${docker.target.platforms}</platforms>
+											</buildx>
+										</build>
+									</image>
+								</images>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 	
 	<dependencyManagement>
@@ -89,4 +160,41 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
+	<profiles>
+		<profile>
+			<id>docker-push</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>push-docker</id>
+								<phase>package</phase>
+								<goals>
+									<goal>build</goal>
+									<goal>push</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.dash</groupId>
+						<artifactId>license-tool-plugin</artifactId>
+						<version>1.1.1-SNAPSHOT</version>
+						<executions>
+							<execution>
+								<id>license-check</id>
+								<goals>
+									<goal>license-check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file