Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Example and docs for ability to copy to and from container for #1164" #2651

Merged
merged 1 commit into from
May 3, 2020
Merged

Revert "Example and docs for ability to copy to and from container for #1164" #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 4 additions & 26 deletions core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,40 @@
package org.testcontainers.junit;

import com.google.common.io.Files;
import com.google.common.io.Resources;
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.File;
import java.io.IOException;
import java.util.Map;

import static org.junit.Assert.assertArrayEquals;
import static org.rnorth.visibleassertions.VisibleAssertions.assertFalse;
import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue;

public class CopyFileToContainerTest {
public static final String destinationOnHost = "/tmp/test-resource-in-host.txt";
private static String directoryInContainer = "/tmp/mappable-resource/";
private static String containerPath = "/tmp/mappable-resource/";
private static String fileName = "test-resource.txt";

@Test
public void checkFileCopied() throws IOException, InterruptedException {
try (
// copyToContainer {
GenericContainer container = new GenericContainer()
.withCommand("sleep", "3000")
// withCopyFileToContainer ensure that a file or directory will be copied to the container
// before starting. In this case, we map a classpath directory to a directory inside the container
.withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), directoryInContainer)
// }
.withCopyFileToContainer(MountableFile.forClasspathResource("/mappable-resource/"), containerPath)
) {
container.start();

// at this point directoryInContainer should exist, and should contain copies of file(s)
String filesList = container.execInContainer("ls", directoryInContainer).getStdout();
String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
assertTrue("file list contains the file", filesList.contains(fileName));

// ...

// copyFromContainer {
container.copyFileFromContainer(directoryInContainer + fileName, destinationOnHost);
// }
}

assertArrayEquals(
Files.toByteArray(new File(destinationOnHost)),
Resources.toByteArray(CopyFileToContainerTest.class.getResource("/mappable-resource/" + fileName))
);
}

@Test
public void shouldUseCopyForReadOnlyClasspathResources() throws Exception {
try (
GenericContainer container = new GenericContainer()
.withCommand("sleep", "3000")
.withClasspathResourceMapping("/mappable-resource/", directoryInContainer, BindMode.READ_ONLY)
.withClasspathResourceMapping("/mappable-resource/", containerPath, BindMode.READ_ONLY)
) {
container.start();
String filesList = container.execInContainer("ls", "/tmp/mappable-resource").getStdout();
Expand Down
16 changes: 0 additions & 16 deletions docs/features/files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,3 @@ new GenericContainer(...)
"/etc/redis.conf",
BindMode.READ_ONLY)
```

## Copying files to and from containers

Files can be copied into the container before startup, or can be copied from the container after the container has started.

### Copying to a container before startup

<!--codeinclude-->
[Copying files to a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyToContainer
<!--/codeinclude-->

### Copying a file from a running container

<!--codeinclude-->
[Copying files from a container](../../core/src/test/java/org/testcontainers/junit/CopyFileToContainerTest.java) inside_block:copyFromContainer
<!--/codeinclude-->