Merge pull request kpelykh#58 from marcuslinke/master

marcuslinke · marcuslinke · commit a976811e70c2 · 2014-05-18T13:07:44.000+02:00
Issue kpelykh#51: Building an image - ADD for remote file URL fails
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -13,6 +13,7 @@
 import com.sun.jersey.client.apache4.ApacheHttpClient4;
 import com.sun.jersey.client.apache4.ApacheHttpClient4Handler;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -33,10 +34,13 @@
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -788,6 +792,16 @@ public ClientResponse build(File dockerFolder) throws DockerException {
 	public ClientResponse build(File dockerFolder, String tag) throws DockerException {
 		return this.build(dockerFolder, tag, false);
 	}
+	
+	private static boolean isFileResource(String resource)  {
+        URI uri;
+		try {
+			uri = new URI(resource);
+		} catch (URISyntaxException e) {
+			throw new RuntimeException(e);
+		}
+        return uri.getScheme() == null || "file".equals(uri.getScheme());
+    }
 
 	public ClientResponse build(File dockerFolder, String tag, boolean noCache) throws DockerException {
 		Preconditions.checkNotNull(dockerFolder, "Folder is null");
@@ -826,19 +840,25 @@ public ClientResponse build(File dockerFolder, String tag, boolean noCache) thro
 						throw new DockerException(String.format("Wrong format on line [%s]", cmd));
 					}
 
-					File src = new File(addArgs[1]);
-					if (!src.isAbsolute()) {
-						src = new File(dockerFolder, addArgs[1]).getCanonicalFile();
-					}
-
-					if (!src.exists()) {
-						throw new DockerException(String.format("Source file %s doesn't exist", src));
-					}
-					if (src.isDirectory()) {
-						filesToAdd.addAll(FileUtils.listFiles(src, null, true));
-					} else {
-						filesToAdd.add(src);
-					}
+					String resource = addArgs[1];
+					
+					if(isFileResource(resource)) {
+						File src = new File(resource);
+						if (!src.isAbsolute()) {
+							src = new File(dockerFolder, resource).getCanonicalFile();
+						} else {
+							throw new DockerException(String.format("Source file %s must be relative to %s", src, dockerFolder));
+						}
+
+						if (!src.exists()) {
+							throw new DockerException(String.format("Source file %s doesn't exist", src));
+						}
+						if (src.isDirectory()) {
+							filesToAdd.addAll(FileUtils.listFiles(src, null, true));
+						} else {
+							filesToAdd.add(src);
+						}
+					} 
 				}
 			}
 
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -619,18 +619,18 @@ public void testNginxDockerfileBuilder() throws DockerException,
 	}
 
 	@Test
-	public void testDockerBuilderAddFile() throws DockerException, IOException {
+	public void testDockerBuilderAddUrl() throws DockerException, IOException {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFile").getFile());
-		dockerfileBuild(baseDir, "Successfully executed testrun.sh");
+				.getResource("testAddUrl").getFile());
+		dockerfileBuild(baseDir, "docker.io");
 	}
 
-        @Test
-        public void testDockerBuilderAddFileInSubfolder() throws DockerException, IOException {
-                File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                                .getResource("testAddFileInSubfolder").getFile());
-                dockerfileBuild(baseDir, "Successfully executed testrun.sh");
-        }
+    @Test
+    public void testDockerBuilderAddFileInSubfolder() throws DockerException, IOException {
+            File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                            .getResource("testAddFileInSubfolder").getFile());
+            dockerfileBuild(baseDir, "Successfully executed testrun.sh");
+    }
 
         @Test
 	public void testDockerBuilderAddFolder() throws DockerException,
@@ -785,7 +785,7 @@ private String dockerfileBuild(File baseDir, String expectedText)
 		ClientResponse logResponse = dockerClient.logContainer(container
 				.getId());
 
-		assertThat(logResponseStream(logResponse), endsWith(expectedText));
+		assertThat(logResponseStream(logResponse), containsString(expectedText));
 
 		return container.getId();
 	}
diff --git a/src/test/resources/testAddUrl/Dockerfile b/src/test/resources/testAddUrl/Dockerfile
@@ -0,0 +1,10 @@
+FROM      ubuntu
+
+# Copy testrun.sh files into the container
+
+ADD	http://www.docker.io       /tmp/docker_home.html
+ADD	./testrun.sh       /tmp/
+
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]
diff --git a/src/test/resources/testAddUrl/testrun.sh b/src/test/resources/testAddUrl/testrun.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cat /tmp/docker_home.html
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#!/bin/sh
++
 +cat /tmp/docker_home.html
++