Merge pull request #180 from magnayn/pr9

marcuslinke · marcuslinke · commit 56356b3efd70 · 2015-04-01T20:36:53.000+02:00
Dockerfiles not called 'dockerfile'
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -98,7 +98,9 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(
 
 	public CommitCmd commitCmd(String containerId);
 
-	public BuildImageCmd buildImageCmd(File dockerFolder);
+    public BuildImageCmd buildImageCmd();
+
+	public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
 
 	public BuildImageCmd buildImageCmd(InputStream tarInputStream);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -28,8 +28,12 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
 
 	public boolean isQuiet();
 
+    public String getPathToDockerfile();
+
 	public AuthConfigurations getBuildAuthConfigs();
-	
+
+    public BuildImageCmd withBaseDirectory(File baseDirectory);
+
     public BuildImageCmd withDockerfile(File dockerfile);
 	
 	public BuildImageCmd withTarInputStream(InputStream tarInputStream);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -289,6 +289,12 @@ public CommitCmd commitCmd(String containerId) {
 				.createCommitCmdExec(), containerId);
 	}
 
+    @Override
+    public BuildImageCmd buildImageCmd() {
+        return new BuildImageCmdImpl(getDockerCmdExecFactory()
+                .createBuildImageCmdExec());
+    }
+
 	@Override
 	public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
 		return new BuildImageCmdImpl(getDockerCmdExecFactory()
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
+import com.google.common.base.Optional;
 
 /**
  * 
@@ -24,6 +25,8 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageC
 	private boolean remove = true;
 	private boolean quiet;
 	private AuthConfigurations buildAuthConfigs;
+    private File dockerFile;
+    private File baseDirectory;
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
@@ -33,10 +36,13 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
 		super(exec);
 		checkNotNull(dockerFileOrFolder, "dockerFolder is null");
 
-        if( dockerFileOrFolder.isDirectory() )
-            withDockerfile( new File(dockerFileOrFolder, "Dockerfile"));
-        else
-            withDockerfile( dockerFileOrFolder);
+        if( dockerFileOrFolder.isDirectory() ) {
+            withBaseDirectory(dockerFileOrFolder);
+            withDockerfile(new File(dockerFileOrFolder, "Dockerfile"));
+        }
+        else {
+            withDockerfile(dockerFileOrFolder);
+        }
 	}
 
 	public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
@@ -55,12 +61,20 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
         checkNotNull(dockerfile);
         if( !dockerfile.exists() )
             throw new IllegalArgumentException("Dockerfile does not exist");
+        if( !dockerfile.isFile() )
+            throw new IllegalArgumentException("Not a directory");
+
+        if( baseDirectory == null )
+            withBaseDirectory(dockerfile.getParentFile());
+
+
+        this.dockerFile = dockerfile;
 
         try {
             withTarInputStream(
                     new Dockerfile(dockerfile)
                             .parse()
-                            .buildDockerFolderTar() );
+                            .buildDockerFolderTar(baseDirectory) );
         } catch (IOException e) {
             // we just created the file this should never happen.
             throw new RuntimeException(e);
@@ -102,12 +116,24 @@ public boolean isQuiet() {
 		return quiet;
 	}
 
-	@Override
+    @Override
+    public String getPathToDockerfile() {
+        int baseLen = baseDirectory.getAbsolutePath().length();
+        return dockerFile.getAbsolutePath().substring(baseLen+1);
+    }
+
+    @Override
 	public AuthConfigurations getBuildAuthConfigs() {
 		return buildAuthConfigs;
 	}
 
-	@Override
+    @Override
+    public BuildImageCmd withBaseDirectory(File baseDirectory) {
+        this.baseDirectory = baseDirectory;
+        return this;
+    }
+
+    @Override
 	public BuildImageCmdImpl withNoCache() {
 		return withNoCache(true);
 	}
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -166,14 +166,18 @@ public class ScannedResult {
     final List<File> filesToAdd = new ArrayList<File>();
 
     public InputStream buildDockerFolderTar() {
+        return buildDockerFolderTar(getDockerFolder());
+    }
+
+    public InputStream buildDockerFolderTar(File directory) {
 
       // ARCHIVE TAR
       File dockerFolderTar = null;
 
       try {
         String archiveNameWithOutExtension = UUID.randomUUID().toString();
 
-        dockerFolderTar = CompressArchiveUtil.archiveTARFiles(getDockerFolder(),
+        dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory,
                                                               filesToAdd,
                                                               archiveNameWithOutExtension);
         return FileUtils.openInputStream(dockerFolderTar);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -35,6 +35,7 @@ public BuildImageCmdExec(WebTarget baseResource) {
 	@Override
 	protected ResponseImpl execute(BuildImageCmd command) {
 		WebTarget webResource = getBaseResource().path("/build");
+        String dockerFilePath = command.getPathToDockerfile();
 		
 		if(command.getTag() != null) {
 			webResource = webResource.queryParam("t", command.getTag());
@@ -48,6 +49,9 @@ protected ResponseImpl execute(BuildImageCmd command) {
         if (command.isQuiet()) {
             webResource = webResource.queryParam("q", "true");
         }
+        if( dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
+            webResource = webResource.queryParam("dockerfile", dockerFilePath);
+        }
 		
 
 	  webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -76,6 +76,34 @@ public void testNginxDockerfileBuilder() {
 				equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
 	}
 
+    @Test
+    public void testNonstandard1() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
+
+        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
+    }
+
+    @Test
+    public void testNonstandard2() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("nonstandard").getFile());
+        File dockerFile = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
+
+
+            InputStream response = dockerClient.buildImageCmd()
+                    .withBaseDirectory(baseDir)
+                    .withDockerfile(dockerFile)
+                    .withNoCache().exec();
+
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
+    }
+
 	@Test
 	public void testDockerBuilderAddUrl()  {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
diff --git a/src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard b/src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard
@@ -0,0 +1,12 @@
+# Nginx
+#
+# VERSION               0.0.1
+
+FROM      ubuntu:latest
+MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"
+
+# make sure the package repository is up to date
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
+RUN apt-get update
+
+RUN apt-get install -y inotify-tools nginx apache2 openssh-server
