Update version

Author: AB-xdev

demo/integration-tests/pom.xml

@@ -118,7 +118,7 @@
 			<dependency>
 				<groupId>software.xdev</groupId>
 				<artifactId>testcontainers-advanced-imagebuilder</artifactId>
-				<version>1.1.1</version>
+				<version>2.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.testcontainers</groupId>

demo/integration-tests/tci-webapp-rest/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1-labs
 # Note: This Dockerfile is used by the integration tests for compiling the app when there was no image was supplied
 ARG JAVA_VERSION=21
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS jre-base
@@ -41,7 +42,18 @@ RUN apk add --no-cache git
 
 WORKDIR /builder
 
-# Copying is prepared by ITC
+# Copy & Cache wrapper
+COPY --parents mvnw .mvn/** ./
+RUN ./mvnw --version
+
+# Copy & Cache poms/dependencies
+COPY --parents **/pom.xml ./
+# Resolve jars so that they can be cached and don't need to be downloaded when a Java file changes
+ARG MAVEN_GO_OFFLINE_COMMAND='./mvnw -B dependency:go-offline -pl demo/webapp-rest -am -Pprod,dev-log -DincludeScope=runtime -T2C'
+RUN echo "Executing '$MAVEN_GO_OFFLINE_COMMAND'"
+RUN ${MAVEN_GO_OFFLINE_COMMAND}
+
+# Copying all other files
 COPY . ./
 
 # A valid Git repo is required for the build
@@ -51,10 +63,10 @@ RUN git config --global user.email "[email protected]" \
   && git add . \
   && git commit -m "Init commit"
 
-ARG mavenbuildcmd='./mvnw -B clean package -pl "demo/webapp-rest" -am -Pprod,dev-log -T2C -Dmaven.test.skip'
+ARG MAVEN_BUILD_COMMAND='./mvnw -B package -pl demo/webapp-rest -am -Pprod,dev-log -T2C -Dmaven.test.skip'
+RUN echo "Executing '$MAVEN_BUILD_COMMAND'"
+RUN ${MAVEN_BUILD_COMMAND}
 
-RUN echo "Executing '$mavenbuildcmd'"
-RUN ${mavenbuildcmd}
 # See also https://docs.spring.io/spring-boot/reference/packaging/container-images/dockerfiles.html for further information
 RUN mv demo/webapp-rest/target/webapp-rest.jar app.jar \
   && java -Djarmode=tools -jar app.jar extract --layers --destination extracted

demo/integration-tests/tci-webapp-vaadin/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1-labs
 # Note: This Dockerfile is used by the integration tests for compiling the app when there was no image was supplied
 ARG JAVA_VERSION=21
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS jre-base
@@ -47,7 +48,18 @@ RUN node --version \
 
 WORKDIR /builder
 
-# Copying is prepared by ITC
+# Copy & Cache wrapper
+COPY --parents mvnw .mvn/** ./
+RUN ./mvnw --version
+
+# Copy & Cache poms/dependencies
+COPY --parents **/pom.xml ./
+# Resolve jars so that they can be cached and don't need to be downloaded when a Java file changes
+ARG MAVEN_GO_OFFLINE_COMMAND='./mvnw -B dependency:go-offline -pl demo/webapp-vaadin -am -Pprod,dev-log -DincludeScope=runtime -T2C'
+RUN echo "Executing '$MAVEN_GO_OFFLINE_COMMAND'"
+RUN ${MAVEN_GO_OFFLINE_COMMAND}
+
+# Copying all other files
 COPY . ./
 
 # A valid Git repo is required for the build
@@ -57,10 +69,10 @@ RUN git config --global user.email "[email protected]" \
   && git add . \
   && git commit -m "Init commit"
 
-ARG mavenbuildcmd='./mvnw -B clean package -pl "demo/webapp-vaadin" -am -Pprod,dev-log -T2C -Dmaven.test.skip'
+ARG MAVEN_BUILD_COMMAND='./mvnw -B package -pl demo/webapp-vaadin -am -Pprod,dev-log -T2C -Dmaven.test.skip'
+RUN echo "Executing '$MAVEN_BUILD_COMMAND'"
+RUN ${MAVEN_BUILD_COMMAND}
 
-RUN echo "Executing '$mavenbuildcmd'"
-RUN ${mavenbuildcmd}
 # See also https://docs.spring.io/spring-boot/reference/packaging/container-images/dockerfiles.html for further information
 RUN mv demo/webapp-vaadin/target/webapp-vaadin.jar app.jar \
   && java -Djarmode=tools -jar app.jar extract --layers --destination extracted

demo/integration-tests/tci-webapp/src/main/java/software/xdev/sse/demo/tci/webapp/containers/WebAppContainerBuilder.java

@@ -8,6 +8,7 @@
 import org.slf4j.LoggerFactory;
 
 import software.xdev.testcontainers.imagebuilder.AdvancedImageFromDockerFile;
+import software.xdev.testcontainers.imagebuilder.compat.DockerfileCOPYParentsEmulator;
 
 
 @SuppressWarnings("PMD.MoreThanOneLogger")
@@ -35,30 +36,32 @@ public static synchronized String getBuiltImageName(final String module)
 		final AdvancedImageFromDockerFile builder =
 			new AdvancedImageFromDockerFile(module + "-local", false)
 				.withLoggerForBuild(LOG_CONTAINER_BUILD)
-				.withAdditionalIgnoreLines(
+				.withPostGitIgnoreLines(
 					// Ignore git-folder, as it will be provided in the Dockerfile
 					".git/**",
 					// Ignore other unused folders and extensions
-					".iml",
-					".md",
-					"target/**",
+					"*.iml",
+					"*.cmd",
+					"*.md",
 					".config/**",
 					".github/**",
 					".idea/**",
 					".run/**",
 					"_dev_infra/**",
-					"src/test/**",
+					// Ignore other Dockerfiles (our required file will always be transferred)
+					"Dockerfile",
 					// Ignore not required test-modules that may have changed
 					// sources only - otherwise the parent pom doesn't find the resources
-					"tci-*/src/**",
-					"webapp-it-base/src/**",
-					"*-it/src/**",
+					"demo/integration-tests/*/src/**",
+					"**/src/test/**",
 					// Ignore resources that are just used for development
-					"webapp-rest/src/main/resources-dev/**")
-				.withDockerFilePath(Paths.get("../" + module + "/Dockerfile"))
-				.withBaseDir(Paths.get("../../"))
-				// File is in root directory - we can't access it
-				.withBaseDirRelativeIgnoreFile(null);
+					"demo/webapp-rest/src/main/resources-dev/**",
+					// Most files from these folders need to be ignored -> Down there for highest prio
+					"node_modules",
+					"target")
+				.withDockerFilePath(Paths.get("../../../demo/integration-tests/" + module + "/Dockerfile"))
+				.withBaseDir(Paths.get("../../../"))
+				.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator());
 
 		try
 		{