From 970fbb60b8c07fd55371f5bcd2a5b22eefe6cc16 Mon Sep 17 00:00:00 2001
From: Matthew Avant <mavant@palantir.com>
Date: Wed, 9 Mar 2016 21:13:26 -0800
Subject: [PATCH] Expose cgroup-parent to the client

---
 .../dockerjava/api/command/CreateContainerCmd.java   |  5 +++++
 .../core/command/CreateContainerCmdImpl.java         | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 1454a5f80..0181d86be 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -179,6 +179,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getPidMode();
 
+    @CheckForNull
+    String getCgroupParent();
+
     @CheckForNull
     Boolean isTty();
 
@@ -402,6 +405,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withWorkingDir(String workingDir);
 
+    CreateContainerCmd withCgroupParent(String cgroupParent);
+
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index e03acbf7f..4f69e9ed0 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -407,6 +407,11 @@ public String getPidMode() {
         return hostConfig.getPidMode();
     }
 
+    @Override
+    public String getCgroupParent() {
+        return hostConfig.getCgroupParent();
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
@@ -871,6 +876,13 @@ public CreateContainerCmd withWorkingDir(String workingDir) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCgroupParent(final String cgroupParent) {
+        checkNotNull(cgroupParent, "cgroupParent was not specified");
+        this.hostConfig.withCgroupParent(cgroupParent);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withPidMode(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");