Created method which copy file from repository to container #378

lukidzi · 2017-06-25T18:35:48Z

I am not sure if this function will be helpful. This is first concept I need to figure out how to check if path exist, how to get message if couldn't copy, and write some tests. I am tested it and I was able to copy file from my resource directory to container.

…e point to container path.

bsideup · 2017-06-25T19:04:17Z

core/src/main/java/org/testcontainers/containers/Container.java

@@ -418,6 +418,8 @@ ExecResult execInContainer(Charset outputCharset, String... command)

    InspectContainerResponse getContainerInfo();

+    void copyFileToContanier(String localPath, String containerPath);


I suggest using MountableFile instead of String localPath

bsideup · 2017-06-25T19:05:04Z

core/src/main/java/org/testcontainers/containers/GenericContainer.java

+    @Override
+    public void copyFileToContanier(String localPath, String containerPath){
+
+        if (!isRunning()) {


since isRunning calls Docker API, I would remove this check and catch an exception from .exec()

bsideup · 2017-06-25T19:05:31Z

core/src/main/java/org/testcontainers/containers/GenericContainer.java

@@ -851,6 +851,27 @@ public ExecResult execInContainer(String... command)
    }

    /**


please move the JavaDoc to Container interface

bsideup · 2017-06-25T19:10:31Z

Hi @lukidzi,

Thanks for your contribution! I added a few review notes from me :)

I would also like to see the tests for this change

glebsts · 2017-06-26T12:48:53Z

core/src/main/java/org/testcontainers/containers/Container.java

@@ -418,6 +418,8 @@ ExecResult execInContainer(Charset outputCharset, String... command)

    InspectContainerResponse getContainerInfo();

+    void copyFileToContanier(String localPath, String containerPath);


typo as well

…after PR review.

bsideup · 2017-07-02T19:07:14Z

Hey @glebsts,

looks good, but could you please fix what Coday says? (press details to see what's wrong)

Thanks!

bsideup · 2017-07-02T19:08:05Z

core/src/main/java/org/testcontainers/containers/GenericContainer.java

+
+        this.dockerClient
+                .copyArchiveToContainerCmd(this.containerId)
+                .withHostResource(mountableLocalFile.getDescription())


please use getResolvedPath

bsideup · 2017-07-02T19:10:37Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

+     * Create a container which wait for some time to test if copy to container works.
+     */
+    @ClassRule
+    public static GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")


Actually, it would be nice if you can replace it with try-with-resources version (see NetworkTest.WithoutRules). It helps to run individual tests without starting everything

can be removed now

glebsts · 2017-07-02T19:11:56Z

@bsideup wrong mention, I guess?)

bsideup · 2017-07-02T19:13:17Z

@glebsts ooops!

/cc @lukidzi

…ed method to getResolvedPath

kiview · 2017-07-06T07:46:13Z

core/src/main/java/org/testcontainers/containers/Container.java

@@ -392,6 +393,17 @@ ExecResult execInContainer(String... command)
    ExecResult execInContainer(Charset outputCharset, String... command)
                    throws UnsupportedOperationException, IOException, InterruptedException;

+    /**
+     *
+     * Method allow to copy file which we have in our repository to docker container


Small Javadoc change:
This method allows to copy a file

I also think it's a file inside the classpath and not inside the repository, correct?

kiview · 2017-07-06T07:47:50Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

@@ -120,7 +122,7 @@ public static void setupContent() throws FileNotFoundException {
            .withExposedPorts(80)
            .withExtraHost("somehost", "192.168.1.10")
            .withCommand("/bin/sh", "-c", "while true; do cat /etc/hosts | nc -l -p 80; done");
-
+    
 //    @Test


Remove commented code

the code wasn't commented in this PR.
Although +1 for removing this added space

Whoops, you're right.

rnorth · 2017-10-16T20:38:55Z

@lukidzi I think this would be a good thing to have if you're still interested in contributing. If you're stuck for time please let us know, though, as it doesn't look like thee's too much more to do.

kiview

Hey, sorry for not looking into this PR for some time. I've requested some minor Javadoc changes, and will merge ASAP afterwards.

kiview · 2017-11-14T12:44:57Z

core/src/main/java/org/testcontainers/containers/Container.java

@@ -392,6 +393,17 @@ ExecResult execInContainer(String... command)
    ExecResult execInContainer(Charset outputCharset, String... command)
                    throws UnsupportedOperationException, IOException, InterruptedException;

+    /**
+     *
+     * Method allow to copy file which is inside classpath to docker container


Copies a file which resides inside the classpath to the container.

kiview · 2017-11-14T12:46:19Z

core/src/main/java/org/testcontainers/containers/Container.java

+     *
+     * Method allow to copy file which is inside classpath to docker container
+     *
+     * @param mountableLocalFile path to file which we would like to place in container


file which is copied into the container

kiview · 2017-11-14T12:46:56Z

core/src/main/java/org/testcontainers/containers/Container.java

+     * Method allow to copy file which is inside classpath to docker container
+     *
+     * @param mountableLocalFile path to file which we would like to place in container
+     * @param containerPath path where we want to copy file


destination path inside the container

kiview · 2017-11-16T13:11:18Z

@bsideup You're review is still pending, I think the changes are fine now?

bsideup · 2017-11-16T13:38:08Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

+
+        try (
+            GenericContainer alpineCopyToContainer = new GenericContainer("alpine:3.2")
+                    .withCommand("sleep 9999")


please use top instead of sleep 9999

bsideup · 2017-11-16T13:39:28Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

+            final MountableFile mountableFile = MountableFile.forClasspathResource("test_copy_to_container.txt");
+            alpineCopyToContainer.copyFileToContainer(mountableFile, "/home/");
+
+            try (final InputStream response = alpineCopyToContainer


Since it was requested a few times already, maybe you can add copyFileFromContainer() as well? :) We should also check the file content here

bsideup · 2017-11-20T07:33:09Z

core/src/main/java/org/testcontainers/containers/GenericContainer.java

+        try (final InputStream response = this.dockerClient
+                .copyArchiveFromContainerCmd(this.containerId, containerPath)
+                .exec()) {
+            try (final TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {


no need for the nested trys, just wrap .exec() result into TarArchiveInputStream

bsideup · 2017-11-20T07:34:02Z

core/src/main/java/org/testcontainers/containers/GenericContainer.java

+     * @throws IOException if there will be error during getNextTarEntry
+     */
+    private void createFileFromTarArchiveInputStream(final String destinationPath, final TarArchiveInputStream tarArchiveInputStream) throws IOException {
+        try (final FileOutputStream out = new FileOutputStream(destinationPath)) {


We have IOUtils on classpath, please use IOUtils.copy()

bsideup · 2017-11-20T07:34:50Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

+    @Test
+    public void copyToContainerTest() throws Exception {
+        //compare purpose
+        File outputFile = new File("src/test/resources/copy-from/test_copy_to_container.txt");


output file should not be placed in src/test, use a temporary directory instead

bsideup · 2017-11-20T07:35:04Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

+        //compare purpose
+        File outputFile = new File("src/test/resources/copy-from/test_copy_to_container.txt");
+        File currentFile = new File("src/test/resources/test_copy_to_container.txt");
+        if(outputFile.exists()){


temp dir will help to avoid this one as well

bsideup · 2017-11-20T19:10:43Z

core/src/test/java/org/testcontainers/junit/GenericContainerRuleTest.java

@@ -39,15 +42,14 @@
    private static final String RABBITMQ_TEST_MESSAGE = "Hello world";
    private static final int RABBITMQ_PORT = 5672;
    private static final int MONGO_PORT = 27017;
-
+    private static final File CONTENT_FOLDER = new File(System.getProperty("user.home") + "/.tmp-test-container");


Why don't you use something like Files.createTempDirectory()?

Fixed, my bad

bsideup · 2017-11-20T19:44:20Z

approved, thanks! @rnorth do you have something to add?

rnorth · 2017-11-26T11:31:39Z

Sorry for being slow to respond - just noticed one more thing: because these methods only work when the container is created/running, we should add guards to check and log a suitable error message. I have the branch locally, so will add that.

rnorth · 2017-11-26T11:48:01Z

Have rebased and squashed on a separate branch, so will merge from there.

rnorth · 2017-11-26T11:48:58Z

Merged! Thank you for the contribution @lukidzi !

First concept. Created method which copy file from repository which w…

3902ead

…e point to container path.

bsideup requested changes Jun 25, 2017

View reviewed changes

bsideup added the enhancement label Jun 25, 2017

glebsts reviewed Jun 26, 2017

View reviewed changes

Added unit test which check if file exist on container. Made changes …

6d34017

…after PR review.

lukidzi changed the title ~~First concept. Created method which copy file from repository which w…~~ Created method which copy file from repository to container Jun 27, 2017

bsideup reviewed Jul 2, 2017

View reviewed changes

lukidzi added 2 commits July 2, 2017 21:52

Code review. Moved container creation to try-with-resources and chang…

7b6b1f7

…ed method to getResolvedPath

Removed ClassRule level container creation

eaf07e5

kiview requested changes Jul 6, 2017

View reviewed changes

Added code review changes.

01fed46

kiview requested changes Nov 14, 2017

View reviewed changes

Added changes to java doc

4dd3f44

kiview approved these changes Nov 16, 2017

View reviewed changes

bsideup requested changes Nov 16, 2017

View reviewed changes

Added copy from container method

3d028fc

bsideup requested changes Nov 20, 2017

View reviewed changes

Code review changes

e2f7df4

bsideup reviewed Nov 20, 2017

View reviewed changes

Changed to temp folder

752ef0f

bsideup approved these changes Nov 20, 2017

View reviewed changes

rnorth closed this in 524b957 Nov 26, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Created method which copy file from repository to container #378

Created method which copy file from repository to container #378

lukidzi commented Jun 25, 2017

bsideup Jun 25, 2017

bsideup Jun 25, 2017

bsideup Jun 25, 2017

bsideup commented Jun 25, 2017

glebsts Jun 26, 2017

bsideup commented Jul 2, 2017

bsideup Jul 2, 2017

bsideup Jul 2, 2017

bsideup Jul 2, 2017

glebsts commented Jul 2, 2017 •

edited

Loading

bsideup commented Jul 2, 2017

kiview Jul 6, 2017

kiview Jul 6, 2017

kiview Jul 6, 2017

bsideup Jul 6, 2017

kiview Jul 6, 2017

rnorth commented Oct 16, 2017

kiview left a comment

kiview Nov 14, 2017

kiview Nov 14, 2017

kiview Nov 14, 2017

kiview commented Nov 16, 2017

bsideup Nov 16, 2017

bsideup Nov 16, 2017

bsideup Nov 20, 2017

bsideup Nov 20, 2017

bsideup Nov 20, 2017

bsideup Nov 20, 2017

bsideup Nov 20, 2017

lukidzi Nov 20, 2017

bsideup commented Nov 20, 2017

rnorth commented Nov 26, 2017

rnorth commented Nov 26, 2017

rnorth commented Nov 26, 2017

		@@ -418,6 +418,8 @@ ExecResult execInContainer(Charset outputCharset, String... command)

		InspectContainerResponse getContainerInfo();

		void copyFileToContanier(String localPath, String containerPath);

		@@ -851,6 +851,27 @@ public ExecResult execInContainer(String... command)
		}

		/**

Created method which copy file from repository to container #378

Created method which copy file from repository to container #378

Conversation

lukidzi commented Jun 25, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bsideup commented Jun 25, 2017

Choose a reason for hiding this comment

bsideup commented Jul 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

glebsts commented Jul 2, 2017 • edited Loading

bsideup commented Jul 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rnorth commented Oct 16, 2017

kiview left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kiview commented Nov 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bsideup commented Nov 20, 2017

rnorth commented Nov 26, 2017

rnorth commented Nov 26, 2017

rnorth commented Nov 26, 2017

glebsts commented Jul 2, 2017 •

edited

Loading