Add workdir to <build> configuration

This was provided by pull request #204

doc/changelog.md

@@ -2,8 +2,9 @@
 
 * **0.12.1**
   - Add `docker:watch` (#187) 
-  - Allow `extraHosts` ips to be resolved at runtime (#196)
-
+  - Allow `extraHosts` IPs to be resolved at runtime (#196)
+  - Add `workDir` as configuration option to `<build>` (#204) 
+
 * **0.12.0**
   - Allow CMD and ENTRYPOINT with shell and exec arguments (#130, #149)
   - Unix Socket support (#179)

doc/manual.md

@@ -237,6 +237,7 @@ of an image configuration. The available subelements are
   [Start-up Arguments](#start-up-arguments) for details.
 * **entrypoint** An entrypoint allows you to configure a container that will run as an executable. 
   See [Start-up Arguments](#start-up-arguments) for details. 
+* **workdir** the directory to change to when starting the container.  
 * **env** hold environments as described in
   [Setting Environment Variables](#setting-environment-variables). 
 * **from** specifies the base image which should be used for this
@@ -1118,6 +1119,7 @@ values in the `<build>` and `<run>` sections.
 * **docker.dns.idx** List of dns servers to use
 * **docker.dnsSearch.idx** List of dns search domains
 * **docker.entrypoint** Container entry point
+* **docker.workdir** Container working directory
 * **docker.env.VARIABLE** Sets an environment
   variable. E.g. `<docker.env.JAVA_OPTS>-Xmx512m</docker.env.JAVA_OPTS>`
   sets the environment variable `JAVA_OPTS`. Multiple such entries can

src/main/java/org/jolokia/docker/maven/assembly/DockerAssemblyManager.java

@@ -174,6 +174,9 @@ DockerFileBuilder createDockerFileBuilder(BuildImageConfiguration buildConfig, A
         if (buildConfig.getMaintainer() != null) {
             builder.maintainer(buildConfig.getMaintainer());
         }
+        if (buildConfig.getWorkdir() != null) {
+            builder.workdir(buildConfig.getWorkdir());
+        }
         if (assemblyConfig != null) {
             builder.add("maven", "")
                    .basedir(assemblyConfig.getBasedir())

src/main/java/org/jolokia/docker/maven/assembly/DockerFileBuilder.java

@@ -25,6 +25,9 @@ public class DockerFileBuilder {
     // Maintainer of this image
     private String maintainer = "docker-maven-plugin@jolokia.org";
 
+    // Workdir
+    private String workdir = null;
+
     // Basedir to be export
     private String basedir = "/maven";
 
@@ -43,6 +46,8 @@ public class DockerFileBuilder {
 
     // list of ports to expose and environments to use
     private List<Integer> ports = new ArrayList<>();
+
+    // environment
     private Map<String,String> envEntries = new HashMap<>();
 
     // exposed volumes
@@ -73,17 +78,23 @@ public String content() throws IllegalArgumentException {
 
         b.append("FROM ").append(baseImage != null ? baseImage : DockerAssemblyManager.DEFAULT_DATA_BASE_IMAGE).append("\n");
         b.append("MAINTAINER ").append(maintainer).append("\n");
-
         addEnv(b);
         addPorts(b);
         addVolumes(b);
         addEntries(b);
+        addWorkdir(b);
         addCmd(b);
         addEntryPoint(b);
 
         return b.toString();
     }
 
+    private void addWorkdir(StringBuilder b) {
+        if (workdir != null) {
+            b.append("WORKDIR ").append(workdir).append("\n");
+        }
+    }
+
     private void addEntryPoint(StringBuilder b){
         if (entryPoint != null) {
             buildArguments(b, "ENTRYPOINT", entryPoint);
@@ -181,6 +192,11 @@ public DockerFileBuilder maintainer(String maintainer) {
         return this;
     }
 
+    public DockerFileBuilder workdir(String workdir) {
+        this.workdir = workdir;
+        return this;
+    }
+
     public DockerFileBuilder basedir(String dir) {
         if (dir != null) {
             basedir = dir;
@@ -214,7 +230,11 @@ public DockerFileBuilder expose(List<String> ports) {
         if (ports != null) {
             for (String port : ports) {
                 if (port != null) {
-                    this.ports.add(Integer.parseInt(port));
+                    try {
+                        this.ports.add(Integer.parseInt(port));
+                    } catch (NumberFormatException exp) {
+                        throw new IllegalArgumentException("Non numeric port " + port + " specified in port mapping",exp);
+                    }
                 }
             }
         }

src/main/java/org/jolokia/docker/maven/config/BuildImageConfiguration.java

@@ -57,6 +57,11 @@ public class BuildImageConfiguration {
      */
     private String command;
 
+    /**
+     * @parameter
+     */
+    private String workdir;
+
     /**
      * @parameter
      */
@@ -81,6 +86,10 @@ public String getMaintainer() {
         return maintainer;
     }
 
+    public String getWorkdir() {
+        return workdir;
+    }
+
     public AssemblyConfiguration getAssemblyConfiguration() {
         return assembly;
     }
@@ -132,6 +141,11 @@ public Builder maintainer(String maintainer) {
             return this;
         }
 
+        public Builder workdir(String workdir) {
+            config.workdir = workdir;
+            return this;
+        }
+
         public Builder assembly(AssemblyConfiguration assembly) {
             config.assembly = assembly;
             return this;

src/main/java/org/jolokia/docker/maven/config/handler/property/ConfigKey.java

@@ -59,6 +59,7 @@ public enum ConfigKey {
     VOLUMES,
     TAGS,
     MAINTAINER,
+    WORKDIR,
     VOLUMES_FROM,
     WAIT_LOG("wait.log"),
     WAIT_TIME("wait.time"),

src/main/java/org/jolokia/docker/maven/config/handler/property/PropertyConfigHandler.java

@@ -68,6 +68,7 @@ private BuildImageConfiguration extractBuildConfiguration(String prefix, Propert
                 .volumes(listWithPrefix(prefix, VOLUMES, properties))
                 .tags(listWithPrefix(prefix, TAGS, properties))
                 .maintainer(withPrefix(prefix, MAINTAINER, properties))
+                .workdir(withPrefix(prefix, WORKDIR, properties))
                 .build();
     }
 

src/main/java/org/jolokia/docker/maven/util/EnvUtil.java

@@ -26,7 +26,7 @@ public static String extractUrl(String dockerHost) {
             if (unixSocket.exists() && unixSocket.canRead() && unixSocket.canWrite()) {
                 connect = "unix:///var/run/docker.sock";
             } else {
-                throw new IllegalArgumentException("No url given and no DOCKER_HOST environment variable set");
+                throw new IllegalArgumentException("No url given, no DOCKER_HOST environment variable and no read/writable '/var/run/docker.sock'");
             }
         }
         String protocol = connect.contains(":" + AbstractDockerMojo.DOCKER_HTTPS_PORT) ? "https:" : "http:";

src/test/java/org/jolokia/docker/maven/assembly/DockerFileBuilderTest.java

@@ -1,16 +1,13 @@
 package org.jolokia.docker.maven.assembly;
 
+import java.io.IOException;
+import java.util.*;
+
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.io.IOUtils;
 import org.jolokia.docker.maven.config.Arguments;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Scanner;
-
 import static org.hamcrest.Matchers.hasEntry;
 import static org.junit.Assert.*;
 
@@ -27,6 +24,7 @@ public void testBuildDockerFile() throws Exception {
                 .basedir("/export")
                 .expose(Collections.singletonList("8080"))
                 .maintainer("maintainer@example.com")
+                .workdir("/tmp")
                 .volumes(Collections.singletonList("/vol1")).content();
 
         String expected = loadFile("docker/Dockerfile.test");

src/test/resources/docker/Dockerfile.test

@@ -4,4 +4,5 @@ ENV foo bar
 EXPOSE 8080
 VOLUME ["/vol1"]
 COPY /src /export/dest
+WORKDIR /tmp
 CMD ["c1","c2"]