mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 23:41:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2113 from crawford/docker-cgroup

Browse Source 
app-emulation/docker: use default cgroupdriver
This commit is contained in:
Alex Crawford 2016-08-11 11:44:48 -07:00 committed by GitHub
commit 6964c82b1f
3 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.11.2-r1.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -5,7 +5,6 @@ After=docker.socket early-docker.target network.target
Requires=docker.socket early-docker.target Requires=docker.socket early-docker.target
[Service] [Service]
Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
EnvironmentFile=-/run/flannel_docker_opts.env EnvironmentFile=-/run/flannel_docker_opts.env
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576

1
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service vendored
View File

@ -5,7 +5,6 @@ After=early-docker.socket
Requires=early-docker.socket Requires=early-docker.socket
[Service] [Service]
Environment="DOCKER_CGROUPS=--exec-opt native.cgroupdriver=systemd"
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
MountFlags=slave MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576