forked from pool/docker
- Changed systemd unit file and default sysconfig file to include network options,
this is needed to get SDN like flannel to work OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=87
This commit is contained in:
parent
8f8770d804
commit
30f62d728c
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 22 15:27:26 UTC 2016 - fcastelli@suse.com
|
||||
|
||||
- Changed systemd unit file and default sysconfig file to include network options,
|
||||
this is needed to get SDN like flannel to work
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 15 09:16:55 UTC 2016 - asarai@suse.de
|
||||
|
||||
|
@ -9,7 +9,7 @@ Requires=docker.socket
|
||||
# exists and systemd currently does not support the cgroup feature set required
|
||||
# for containers run by docker
|
||||
EnvironmentFile=/etc/sysconfig/docker
|
||||
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
|
||||
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
|
||||
MountFlags=slave
|
||||
LimitNOFILE=1048576
|
||||
LimitNPROC=1048576
|
||||
|
@ -6,3 +6,5 @@
|
||||
## ServiceRestart : docker
|
||||
#
|
||||
DOCKER_OPTS=""
|
||||
|
||||
DOCKER_NETWORK_OPTIONS=""
|
||||
|
Loading…
Reference in New Issue
Block a user