FF! docker image on Jboss (6.4) (frankframework#1548)

lenardvandermaas · Mar 10, 2021 · 165911f · 165911f
1 parent 0cf840a
commit 165911f
Show file tree

Hide file tree

Showing 33 changed files with 1,714 additions and 692 deletions.
diff --git a/core/src/main/resources/springJBOSS.xml b/core/src/main/resources/springJBOSS.xml
@@ -10,6 +10,11 @@
 		"
 	>
 
+	<!-- SpringDataSourceFactory augments the datasource with LazyConnectionDataSourceProxy.
+		This will cause Jboss server to throw an exception with the following message: 'You cannot set autocommit during a managed transaction!'.
+		To avoid jboss server to throw an exception use JndiDataSourceFactory -->
+	<bean id="dataSourceFactory" class="nl.nn.adapterframework.jndi.JndiDataSourceFactory" />
+
 	<!--
 	An open source transaction manager.
 	In order to properly handle 'Propagation: Supports', set property

diff --git a/docker/appserver/Jboss-WildFly/Dockerfile b/docker/appserver/Jboss-WildFly/Dockerfile
@@ -0,0 +1,9 @@
+ARG IMAGE_VERSION
+ARG DOCKER_REPO
+FROM ${DOCKER_REPO}:${IMAGE_VERSION}
+
+# copy the frank framework
+COPY target/dependencies/ibis-adapterframework-ear.ear ${JBOSS_HOME}/standalone/deployments/iaf.ear
+
+# copy JDBC and JMS drivers
+COPY target/dependencies/*.jar ${JBOSS_HOME}/standalone/lib/
diff --git a/docker/appserver/Jboss-WildFly/example/Dockerfile b/docker/appserver/Jboss-WildFly/example/Dockerfile
@@ -0,0 +1,24 @@
+ARG SERVER_TYPE
+FROM iaf-as-${SERVER_TYPE}
+ARG SERVER_TYPE
+ARG STANDALONE_VERSION
+# copy any additional drivers
+COPY target/dependencies/*.jar ${JBOSS_HOME}/standalone/lib/
+
+# copy database and jms configuration
+COPY src/configurations/standalone_${SERVER_TYPE}${STANDALONE_VERSION}.xml ${JBOSS_HOME}/standalone/configuration/standalone.xml
+
+# copy configuration, properties and testscenarios
+COPY target/dependencies/frank/configuration/*-resources.jar ${JBOSS_HOME}/standalone/lib/ext/
+COPY target/dependencies/frank/configuration/*-configurations.jar ${JBOSS_HOME}/standalone/lib/ext/
+COPY target/dependencies/frank/testtool /opt/frank/testtool
+
+
+COPY src/scripts/add_modules.py /home/add_modules.py
+
+
+USER root
+RUN if [ "$SERVER_TYPE" = "jboss" ]; then yum -y install python3; fi
+
+USER jboss
+RUN if [ "$SERVER_TYPE" = "jboss" ]; then python3 /home/add_modules.py; else python /home/add_modules.py; fi
diff --git a/docker/appserver/WildFly/example/pom.xml → ...r/appserver/Jboss-WildFly/example/pom.xml b/docker/appserver/WildFly/example/pom.xml → ...r/appserver/Jboss-WildFly/example/pom.xml
@@ -3,19 +3,19 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ibis-adapterframework-docker-as-wildfly-iaf-example</artifactId>
-	<name>Frank!Framework Docker image WildFly/iaf-example</name>
+	<artifactId>ibis-adapterframework-docker-as-jboss-wildfly-iaf-example</artifactId>
+	<name>Frank!Framework Docker image jboss-wildfly/iaf-example</name>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.ibissource</groupId>
-		<artifactId>ibis-adapterframework-docker-as-wildfly</artifactId>
+		<artifactId>ibis-adapterframework-docker-as-jboss-wildfly</artifactId>
 		<version>7.6-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.ibissource</groupId>
-			<artifactId>ibis-adapterframework-docker-as-wildfly</artifactId>
+			<artifactId>ibis-adapterframework-docker-as-jboss-wildfly</artifactId>
 			<version>${iaf.version}</version>
 			<type>pom</type>
 		</dependency>
@@ -42,6 +42,24 @@
 	<build>
 		<defaultGoal>package</defaultGoal>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<phase>initialize</phase>
+						<goals>
+							<goal>read-project-properties</goal>
+						</goals>
+						<configuration>
+							<files>
+								<file>${project.parent.basedir}/server.properties</file>
+							</files>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -120,7 +138,11 @@
 								<exec executable="docker">
 									<arg value="build"/>
 									<arg value="-t"/>
-									<arg value="iaf-example-wildfly"/>
+									<arg value="iaf-example-${SERVER_TYPE}"/>
+									<arg value="--build-arg"/>
+									<arg value="SERVER_TYPE=${SERVER_TYPE}"/>
+									<arg value="--build-arg"/>
+									<arg value="STANDALONE_VERSION=${STANDALONE_VERSION}"/>
 									<arg value="."/>
 								</exec>
 							</target>