Use "copy" strategy in withClasspathResourceMapping where appropria…

…te (#1814)
testcontainers · Sep 3, 2019 · c9b66eb · c9b66eb
1 parent 88a4eaf
commit c9b66eb
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 7 deletions.
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -967,7 +967,11 @@ public SELF withClasspathResourceMapping(final String resourcePath, final String
     public SELF withClasspathResourceMapping(final String resourcePath, final String containerPath, final BindMode mode, final SelinuxContext selinuxContext) {
         final MountableFile mountableFile = MountableFile.forClasspathResource(resourcePath);
 
-        this.addFileSystemBind(mountableFile.getResolvedPath(), containerPath, mode, selinuxContext);
+        if (mode == BindMode.READ_ONLY && selinuxContext == SelinuxContext.NONE) {
+            withCopyFileToContainer(mountableFile, containerPath);
+        } else {
+            addFileSystemBind(mountableFile.getResolvedPath(), containerPath, mode, selinuxContext);
+        }
 
         return self();
     }

diff --git a/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java b/core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
@@ -1,25 +1,62 @@
 package org.testcontainers.junit;
 
-import org.junit.Assert;
 import org.junit.Test;
+import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.utility.MountableFile;
+
 import java.io.IOException;
+import java.util.Map;
+
+import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;
 
 public class CopyFileToContainerTest {
     private static String containerPath = "/tmp/mappable-resource/";
     private static String fileName = "test-resource.txt";
 
     @Test
     public void checkFileCopied() throws IOException, InterruptedException {
-        try(
-            GenericContainer container = new GenericContainer("alpine:latest")
-                .withCommand("sleep","3000")
+        try (
+            GenericContainer container = new GenericContainer()
+                .withCommand("sleep", "3000")
                 .withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
         ) {
             container.start();
-            String filesList = container.execInContainer("ls","/tmp/mappable-resource").getStdout();
-            Assert.assertTrue(filesList.contains(fileName));
+            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+            assertTrue("file list contains the file", filesList.contains(fileName));
+        }
+    }
+
+    @Test
+    public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
+        try (
+            GenericContainer container = new GenericContainer()
+                .withCommand("sleep", "3000")
+                .withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
+        ) {
+            container.start();
+            String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
+            assertTrue("file list contains the file", filesList.contains(fileName));
         }
     }
+
+    @Test
+    public void shouldUseCopyOnlyWithReadOnlyClasspathResources() {
+        String resource = "/test_copy_to_container.txt";
+        GenericContainer<?> container = new GenericContainer<>()
+            .withClasspathResourceMapping(resource, "/readOnly", BindMode.READ_ONLY)
+            .withClasspathResourceMapping(resource, "/readOnlyNoSelinux", BindMode.READ_ONLY)
+
+            .withClasspathResourceMapping(resource, "/readOnlyShared", BindMode.READ_ONLY, SelinuxContext.SHARED)
+            .withClasspathResourceMapping(resource, "/readWrite", BindMode.READ_WRITE);
+
+        Map<MountableFile, String> copyMap = container.getCopyToFileContainerPathMap();
+        assertTrue("uses copy for read-only", copyMap.containsValue("/readOnly"));
+        assertTrue("uses copy for read-only and no Selinux", copyMap.containsValue("/readOnlyNoSelinux"));
+
+        assertFalse("uses mount for read-only with Selinux", copyMap.containsValue("/readOnlyShared"));
+        assertFalse("uses mount for read-write", copyMap.containsValue("/readWrite"));
+    }
 }