docker:build - add support for WORKDIR

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

@@ -148,6 +148,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";
 
@@ -42,7 +45,7 @@ public class DockerFileBuilder {
     private List<AddEntry> addEntries = new ArrayList<>();
 
     // list of ports to expose and environments to use
-    private List<Integer> ports = new ArrayList<>();
+    private List<String> ports = new ArrayList<>();
     private Map<String,String> envEntries = new HashMap<>();
 
     // exposed volumes
@@ -73,11 +76,11 @@ 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);
+        if (workdir != null) b.append("WORKDIR ").append(workdir).append("\n");
         addCmd(b);
         addEntryPoint(b);
 
@@ -138,7 +141,7 @@ private void addEnv(StringBuilder b) {
     private void addPorts(StringBuilder b) {
         if (ports.size() > 0) {
             b.append("EXPOSE");
-            for (Integer port : ports) {
+            for (String port : ports) {
                 b.append(" ").append(port);
             }
             b.append("\n");
@@ -181,6 +184,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 +222,7 @@ public DockerFileBuilder expose(List<String> ports) {
         if (ports != null) {
             for (String port : ports) {
                 if (port != null) {
-                    this.ports.add(Integer.parseInt(port));
+                    this.ports.add(port);
                 }
             }
         }

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

@@ -66,6 +66,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();
     }