Merge pull request #5 from xdev-software/develop

Release

Author: AB-xdev

CHANGELOG.md

@@ -0,0 +1,5 @@
+# 1.0.1
+* Minor improvements in cleanup behavior (backported from upstream)
+
+# 1.0.0
+_Initial release_

README.md

@@ -28,3 +28,5 @@ See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how
 
 ## Dependencies and Licenses
 View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/testcontainers-advanced-imagebuilder/dependencies)
+
+<sub>Disclaimer: This is not an official Testcontainers product and not associated</sub>

renovate.json5

@@ -1,4 +1,14 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "rebaseWhen": "behind-base-branch"
+  "rebaseWhen": "behind-base-branch",
+  "packageRules": [
+    {
+      "description": "Docker - Java LTS",
+      "packagePattern": "^eclipse-temurin",
+      "matchDatasources": [
+        "docker"
+      ],
+      "allowedVersions": "/^21\\-alpine$/"
+    }
+  ]
 }

testcontainers-advanced-imagebuilder-demo/Dockerfile

@@ -28,7 +28,7 @@ ARG mvncmd='clean package -pl "testcontainers-advanced-imagebuilder-dummy-app" -
 
 RUN echo "Executing '$mvncmd'"
 RUN chmod +x ./mvnw \
-  && ./mvnw -B $mvncmd
+  && ./mvnw -B ${mvncmd}
 
 # Stage 2: Build the executable image
 FROM eclipse-temurin:21-jre-alpine
@@ -40,8 +40,8 @@ ARG gid=1000
 ARG APP_DIR=/opt/dummy-app
 
 # Create user + group + home
-RUN mkdir -p $APP_DIR \
-  && chown ${uid}:${gid} $APP_DIR \
+RUN mkdir -p ${APP_DIR} \
+  && chown ${uid}:${gid} ${APP_DIR} \
   && addgroup -g ${gid} ${group} \
   && adduser -h "$APP_DIR" -u ${uid} -G ${group} -s /bin/bash -D ${user}
 
@@ -51,4 +51,4 @@ USER ${user}
 
 COPY --from=build-env --chown=${user}:${group} build/testcontainers-advanced-imagebuilder-dummy-app/target/dummy-app.jar ${APP_DIR}/dummy-app.jar
 
-CMD java $JAVA_OPTS -jar /opt/dummy-app/dummy-app.jar
+CMD java ${JAVA_OPTS} -jar /opt/dummy-app/dummy-app.jar

testcontainers-advanced-imagebuilder-dummy-app/README.md

@@ -0,0 +1 @@
+This is a dummy application that can be started as a container

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java

@@ -85,7 +85,7 @@ public class AdvancedImageFromDockerFile
 	StringsTrait<AdvancedImageFromDockerFile>,
 	DockerfileTrait<AdvancedImageFromDockerFile>
 {
-	protected static final Logger LOG = LoggerFactory.getLogger(AdvancedImageFromDockerFile.class);
+	protected static final Logger LOGGER = LoggerFactory.getLogger(AdvancedImageFromDockerFile.class);
 	protected final String dockerImageName;
 
 	protected final boolean deleteOnExit;
@@ -149,12 +149,6 @@ protected String resolve()
 
 		try
 		{
-			if(this.deleteOnExit)
-			{
-				this.log().info("Registering image for cleanup when tests are finished");
-				ResourceReaper.instance().registerImageForCleanup(this.dockerImageName);
-			}
-			
 			// We have to use pipes to avoid high memory consumption since users might want to build huge images
 			final PipedInputStream in = new PipedInputStream();
 			final PipedOutputStream out = new PipedOutputStream(in);
@@ -168,6 +162,7 @@ protected String resolve()
 			{
 				labels.putAll(buildImageCmd.getLabels());
 			}
+			this.deleteImageOnExitIfRequired(labels);
 			labels.putAll(DockerClientFactory.DEFAULT_LABELS);
 			buildImageCmd.withLabels(labels);
 
@@ -209,6 +204,18 @@ protected String resolve()
 		}
 	}
 
+	@SuppressWarnings("deprecation") // There is no alternative and it's also used in the default implementation
+	protected void deleteImageOnExitIfRequired(final Map<String, String> labels)
+	{
+		if(!this.deleteOnExit)
+		{
+			return;
+		}
+		
+		this.log().debug("Registering image for cleanup when finished");
+		labels.putAll(ResourceReaper.instance().getLabels());
+	}
+	
 	protected long getBytesToDockerDaemon(final PipedOutputStream out) throws IOException
 	{
 		long bytesToDockerDaemon = 0L;
@@ -406,7 +413,7 @@ protected void prePullDependencyImages(final Set<String> imagesToPull)
 
 	protected Logger log()
 	{
-		return LOG;
+		return LOGGER;
 	}
 
 	public AdvancedImageFromDockerFile withBuildArg(final String key, final String value)