From 70a8d4e35672553c856fc86eaf90aee78411e017 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 5 Aug 2016 11:15:20 -0700 Subject: [PATCH] app-emulation/docker: use default cgroupdriver --- .../docker/{docker-1.11.2.ebuild => docker-1.11.2-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/docker.service | 1 - .../app-emulation/docker/files/early-docker.service | 1 - 3 files changed, 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.11.2.ebuild => docker-1.11.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2-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 2861852b3f..90fe9a7386 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,7 +5,6 @@ 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 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 d3cc785d83..d2876a1bb8 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,7 +5,6 @@ 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