Skip to content
This repository has been archived by the owner on Sep 18, 2020. It is now read-only.

app-emulation/docker: use default cgroupdriver #2113

Merged
merged 1 commit into from
Aug 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app-emulation/docker/files/docker.service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion app-emulation/docker/files/early-docker.service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down