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

Merge pull request #24 from unclejack/fix_docker_container_networking

Browse Source 
Fix docker container networking
This commit is contained in:
Brandon Philips 2013-06-20 10:40:17 -07:00
commit 07c62d7765
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,15 @@
[Service] [Service]
Type=forking Type=forking
ExecStartPre=/bin/mount --make-rprivate / ExecStartPre=/bin/mount --make-rprivate /
ExecStartPre=/sbin/brctl addbr lxcbr0 # Enable forwarding to allow NAT to work
ExecStartPre=/bin/ifconfig lxcbr0 10.65.41.1 # 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 # HACK: for some reason docker is crashing when exiting a container when being
# supervised by systemd. Fork out for now. Real solution should be: # supervised by systemd. Fork out for now. Real solution should be:
# ExecStart=/usr/bin/docker -d -D -b lxcbr0 # ExecStart=/usr/bin/docker -d -D
ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D -b lxcbr0 &" ExecStart=/bin/bash -c "/usr/bin/nohup /usr/bin/docker -d -D &"
ExecStopPost=/bin/ifconfig lxcbr0 down
ExecStopPost=/sbin/brctl delbr lxcbr0
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target