From cb89a9fce98aff30ad078164b5848765cf5a83df Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Thu, 25 Feb 2016 19:36:24 -0800
Subject: [PATCH] app-emulation/docker: override native.cgroupdriver

---
 .../docker/{docker-1.10.1.ebuild => docker-1.10.1-r1.ebuild}   | 0
 .../coreos-overlay/app-emulation/docker/files/docker.service   | 3 ++-
 .../app-emulation/docker/files/early-docker.service            | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.10.1.ebuild => docker-1.10.1-r1.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
index befd882b25..2861852b3f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service
@@ -5,11 +5,12 @@ After=docker.socket early-docker.target network.target
 Requires=docker.socket early-docker.target
 
 [Service]
+Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
 EnvironmentFile=-/run/flannel_docker_opts.env
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
-ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
+ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
index 6f044a4db3..3ef49fae25 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service
@@ -5,11 +5,12 @@ After=early-docker.socket
 Requires=early-docker.socket
 
 [Service]
+Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
 Environment=TMPDIR=/var/tmp
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
-ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS
+ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS
 
 [Install]
 WantedBy=early-docker.target