Update testcontainers-advanced-imagebuilder to 2.0.1

Author: AB-xdev

testcontainers/Standalone.Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1-labs
 ARG JAVA_VERSION=21
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS jre-base
 
@@ -35,18 +36,27 @@ ENTRYPOINT ["/entrypoint.sh"]
 
 FROM eclipse-temurin:${JAVA_VERSION}-jdk-alpine AS builder
 
-RUN apk add --no-cache git bash
+RUN apk add --no-cache bash
 
 WORKDIR /builder
 
-# Copying context is prepared by Testcontainers
-COPY . ./
+# Copy & Cache wrapper
+COPY --parents mvnw .mvn/** ./
+RUN ./mvnw --version
 
-ARG mvncmd='clean package -pl "server" -am -T2C -Dmaven.test.skip'
+# 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 server -am -DincludeScope=runtime -T2C'
+RUN echo "Executing '$MAVEN_GO_OFFLINE_COMMAND'"
+RUN ${MAVEN_GO_OFFLINE_COMMAND}
 
-RUN echo "Executing '$mvncmd'"
-RUN chmod +x ./mvnw \
-  && ./mvnw -B ${mvncmd}
+# Copying all other files
+COPY . ./
+# Run the actual build
+ARG MAVEN_BUILD_COMMAND='./mvnw -B package -pl "server" -am -T2C -Dmaven.test.skip'
+RUN echo "Executing '$MAVEN_BUILD_COMMAND'"
+RUN ${MAVEN_BUILD_COMMAND}
 
 
 FROM jre-minimized

testcontainers/pom.xml

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

testcontainers/src/test/java/software/xdev/testcontainers/mockserver/containers/MockServerContainerTest.java

@@ -40,6 +40,7 @@
 import software.xdev.mockserver.model.Format;
 import software.xdev.mockserver.model.HttpForward;
 import software.xdev.testcontainers.imagebuilder.AdvancedImageFromDockerFile;
+import software.xdev.testcontainers.imagebuilder.compat.DockerfileCOPYParentsEmulator;
 
 
 @SuppressWarnings("resource") // HttpClient close does not exist on Java 17!
@@ -52,7 +53,7 @@ static void buildImage()
 	{
 		image = DockerImageName.parse(new AdvancedImageFromDockerFile("mockserver")
 			.withLoggerForBuild(LoggerFactory.getLogger("container.build.mockserver"))
-			.withAdditionalIgnoreLines(
+			.withPostGitIgnoreLines(
 				// Ignore files that aren't related to the built code
 				".git/**",
 				".config/**",
@@ -61,13 +62,15 @@ static void buildImage()
 				".run/**",
 				"assets/**",
 				"docs/**",
-				".md",
-				".cmd",
+				"Dockerfile",
+				"*.md",
+				"*.cmd",
 				"/renovate.json5",
 				"/client/src/**",
 				"/testcontainers/src/**")
 			.withDockerFilePath(Paths.get("../testcontainers/Standalone.Dockerfile"))
 			.withBaseDir(Paths.get("../"))
+			.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator())
 			.get());
 	}