mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from unclejack/run_docker_service_without_forking

Browse Source 
make docker run directly under systemd without forking
This commit is contained in:
Michael Marineau 2013-06-27 07:29:00 -07:00
commit 0a6010bf45
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
[Service]
Type=forking
Type=simple
ExecStartPre=/bin/mount --make-rprivate /
# Enable forwarding to allow NAT to work
# TODO: Move this to sysctl.conf
ExecStartPre=/sbin/sysctl -w net.ipv4.ip_forward=1
# HACK: for some reason docker is crashing when exiting a container when being
# supervised by systemd. Fork out for now. Real solution should be:
# ExecStart=/usr/bin/docker -d -D
# Try to use this alternate way of starting docker if docker crashes for you:
# ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &"
# You also need to update Type above to: Type=forking
ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &"
ExecStart=/usr/bin/docker -d -D
[Install]
WantedBy=multi-user.target