rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

- Changed systemd unit file and default sysconfig file to include network options,

Browse Source 
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:
Flavio Castelli 2016-03-22 15:28:46 +00:00 committed by Git OBS Bridge
parent 8f8770d804
commit 30f62d728c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -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 Tue Mar 15 09:16:55 UTC 2016 - asarai@suse.de

2
docker.service
View File

@ -9,7 +9,7 @@ Requires=docker.socket
# exists and systemd currently does not support the cgroup feature set required # exists and systemd currently does not support the cgroup feature set required
# for containers run by docker # for containers run by docker
EnvironmentFile=/etc/sysconfig/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 MountFlags=slave
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576

2
sysconfig.docker
View File

@ -6,3 +6,5 @@
## ServiceRestart : docker ## ServiceRestart : docker
# #
DOCKER_OPTS="" DOCKER_OPTS=""
DOCKER_NETWORK_OPTIONS=""