REMOVED: 'json-file' default as this is redundant.

Christopher Dancy · Christopher Dancy · commit 3e00a59902e8 · 2015-07-18T09:22:08.000-04:00
ADDED: documentation on how to use LogConfig and its available drivers.
ADDED: fleshed out LogConfig support to be more in line with other options.
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
@@ -88,6 +89,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
     public Link[] getLinks();
 
     public LxcConf[] getLxcConf();
+    
+    public LogConfig getLogConfig();
 
     public String getMacAddress();
 
@@ -224,6 +227,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
+    public CreateContainerCmd withLogConfig(LogConfig logConfig);
+
     public CreateContainerCmd withMemoryLimit(long memoryLimit);
 
     public CreateContainerCmd withMemorySwap(long memorySwap);
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -1,20 +1,37 @@
 package com.github.dockerjava.api.model;
 
-import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/**
+ * Log driver to use for a created/running container. The
+ * available types are:
+ * 
+ *     json-file (default)
+ *     syslog
+ *     journald
+ *     none
+ *
+ * If a driver is specified that is NOT supported,docker
+ * will default to null. If configs are supplied that are
+ * not supported by the type docker will ignore them. In most 
+ * cases setting the config option to null will suffice. Consult 
+ * the docker remote API for a more detailed and up-to-date 
+ * explanation of the available types and their options.
+ */
 public class LogConfig {
     
     @JsonProperty("Type")
-    public String type = "json-file";
+    public String type;
     
     @JsonProperty("Config")
-    public List<String> config = null;
+    public Map<String, String> config;
 
-    public LogConfig(String type) {
+    public LogConfig(String type, Map<String, String> config) {
         this.type = type;
+        this.config = config;
     }
 
     public LogConfig() {
@@ -23,14 +40,20 @@ public LogConfig() {
     public String getType() {
         return type;
     }
-    
-    @JsonIgnore
-    public List<String> getConfig() {
-    	return config;
-    }
 
     public LogConfig setType(String type) {
         this.type = type;
         return this;
     }
+
+    @JsonIgnore
+    public Map<String, String> getConfig() {
+    	return config;
+    }
+    
+    @JsonIgnore
+    public LogConfig setConfig(Map<String, String> config) {
+    	this.config = config;
+    	return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
@@ -269,6 +270,12 @@ public Map<String, String> getLabels() {
     public LxcConf[] getLxcConf() {
         return hostConfig.getLxcConf();
     }
+    
+    @Override
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return hostConfig.getLogConfig();
+    }
 
     public String getMacAddress() {
         return macAddress;
@@ -558,6 +565,13 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         this.hostConfig.setLxcConf(lxcConf);
         return this;
     }
+    
+    @Override
+    public CreateContainerCmd withLogConfig(LogConfig logConfig) {
+        checkNotNull(logConfig, "logConfig was not specified");
+        this.hostConfig.setLogConfig(logConfig);
+        return this;
+    }
 
     @Override
     public CreateContainerCmdImpl withMacAddress(String macAddress) {
