Do not transfer mountable file when tar name is "." or ".." (docker is unable to use this files)

Author: bedla

core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java

@@ -3,6 +3,7 @@
 import org.testcontainers.utility.MountableFile;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 /**
@@ -50,6 +51,10 @@ default SELF withFileFromFile(String path, File file, Integer mode) {
      * @return self
      */
     default SELF withFileFromPath(String path, Path filePath, Integer mode) {
+        final boolean fileStoredToDir = Files.isRegularFile(filePath) && (".".equals(path) || "..".equals(path));
+        if (fileStoredToDir) {
+            throw new IllegalArgumentException("Unable to store file '" + filePath + "' to docker path '" + path + "'");
+        }
         final MountableFile mountableFile = MountableFile.forHostPath(filePath, mode);
         return ((SELF) this).withFileFromTransferable(path, mountableFile);
     }

core/src/main/java/org/testcontainers/utility/MountableFile.java

@@ -322,6 +322,7 @@ private void recursiveTar(String entryFilename, String rootPath, String itemPath
             tarEntry.setMode(getUnixFileMode(itemPath));
             tarArchive.putArchiveEntry(tarEntry);
 
+            log.trace("Transferring {} '{}'", sourceFile.isFile() ? "file" : "directory", sourceFile);
             if (sourceFile.isFile()) {
                 Files.copy(sourceFile.toPath(), tarArchive);
             }
@@ -377,7 +378,7 @@ public static int getUnixFileMode(final Path path) {
             // Truncate mode bits for z/OS
             if ("OS/390".equals(SystemUtils.OS_NAME) ||
                 "z/OS".equals(SystemUtils.OS_NAME) ||
-                "zOS".equals(SystemUtils.OS_NAME) ) {
+                "zOS".equals(SystemUtils.OS_NAME)) {
                 unixMode &= TarConstants.MAXID;
                 unixMode |= Files.isDirectory(path) ? 040000 : 0100000;
             }

core/src/test/java/org/testcontainers/utility/DirectoryTarResourceTest.java

@@ -4,11 +4,13 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.core.IsCollectionContaining;
 import org.junit.Test;
+import org.rnorth.visibleassertions.VisibleAssertions;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.Arrays;
 
 import static org.hamcrest.CoreMatchers.allOf;
@@ -61,6 +63,45 @@ public void simpleRecursiveFileWithPermissionTest() {
                 exactlyNItems(1, allOf(containsString("-rwxr-xr--"), containsString("foo"))));
     }
 
+    @Test
+    public void transferFileDockerDaemon() {
+        GenericContainer container = new GenericContainer(
+                new ImageFromDockerfile()
+                        .withDockerfileFromBuilder(builder ->
+                                builder.from("alpine:3.3")
+                                        .copy("bar", "/foo/")
+                                        .cmd("ls", "-al", "/foo")
+                                        .build()
+                        ).withFileFromFile("bar", new File("src/test/resources/mappable-resource/test-resource.txt"),
+                        0754))
+                .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+
+        container.start();
+        String listing = container.getLogs();
+
+        assertThat("Listing shows that file is copied.",
+                Arrays.asList(listing.split("\\n")),
+                exactlyNItems(1, allOf(containsString("-rwxr-xr--"), containsString("bar"))));
+    }
+
+    @Test
+    public void unableToTransferFileNamedDotToDockerDaemon() {
+        VisibleAssertions.assertThrows("Unable to store file '" +
+                Paths.get("src", "test", "resources", "mappable-resource", "test-resource.txt") + "' to docker path '.'",
+            IllegalArgumentException.class, () -> {
+                new GenericContainer(
+                    new ImageFromDockerfile()
+                        .withDockerfileFromBuilder(builder ->
+                            builder.from("alpine:3.3")
+                                .copy(".", "/foo/")
+                                .cmd("ls", "-al", "/foo")
+                                .build()
+                        ).withFileFromFile(".", new File("src/test/resources/mappable-resource/test-resource.txt"),
+                        0754))
+                    .withStartupCheckStrategy(new OneShotStartupCheckStrategy());
+            });
+    }
+
     @Test
     public void simpleRecursiveClasspathResourceTest() {
         // This test combines the copying of classpath resources from JAR files with the recursive TAR approach, to allow JARed classpath resources to be copied in to an image