Added support for HostConfig.LogConfig

Christopher Dancy · Christopher Dancy · commit dc8b02578905 · 2015-07-17T16:36:42.000-04:00
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -17,6 +17,9 @@ public class HostConfig {
 
     @JsonProperty("LxcConf")
     private LxcConf[] lxcConf;
+    
+    @JsonProperty("LogConfig")
+    private LogConfig logConfig;
 
     @JsonProperty("PortBindings")
     private Ports portBindings;
@@ -66,13 +69,14 @@ public class HostConfig {
     public HostConfig() {
     }
 
-    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
+    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings, boolean publishAllPorts,
             boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom,
             String containerIDFile, Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy,
             String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
+        this.logConfig = logConfig;
         this.portBindings = portBindings;
         this.publishAllPorts = publishAllPorts;
         this.privileged = privileged;
@@ -98,6 +102,11 @@ public Bind[] getBinds() {
     public LxcConf[] getLxcConf() {
         return lxcConf;
     }
+    
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return (logConfig == null) ? new LogConfig() : logConfig;
+    }
 
     public Ports getPortBindings() {
         return portBindings;
@@ -177,6 +186,11 @@ public void setLinks(Link... links) {
     public void setLxcConf(LxcConf[] lxcConf) {
         this.lxcConf = lxcConf;
     }
+    
+    @JsonIgnore
+    public void setLogConfig(LogConfig logConfig) {
+        this.logConfig = logConfig;
+    }
 
     public void setPortBindings(Ports portBindings) {
         this.portBindings = portBindings;
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class LogConfig {
+    
+    @JsonProperty("Type")
+    public String type = "json-file";
+    
+    @JsonProperty("Config")
+    public List<String> config = null;
+
+    public LogConfig(String type) {
+        this.type = type;
+    }
+
+    public LogConfig() {
+    }
+
+    public String getType() {
+        return type;
+    }
+    
+    @JsonIgnore
+    public List<String> getConfig() {
+    	return config;
+    }
+
+    public LogConfig setType(String type) {
+        this.type = type;
+        return this;
+    }
+}
