tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'friism-add-exception-for-windows-overlay-driver'

Browse Source
This commit is contained in:
Joffrey F 2017-05-05 11:41:23 -07:00
commit 98f7f6f228
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/network.py
View File

@ -18,6 +18,7 @@ log = logging.getLogger(__name__)
OPTS_EXCEPTIONS = [ OPTS_EXCEPTIONS = [
'com.docker.network.driver.overlay.vxlanid_list', 'com.docker.network.driver.overlay.vxlanid_list',
'com.docker.network.windowsshim.hnsid'
] ]

3
tests/unit/network_test.py
View File

@ -66,7 +66,8 @@ class NetworkTest(unittest.TestCase):
options = {'com.docker.network.driver.foo': 'bar'} options = {'com.docker.network.driver.foo': 'bar'}
remote_options = { remote_options = {
'com.docker.network.driver.overlay.vxlanid_list': '257', 'com.docker.network.driver.overlay.vxlanid_list': '257',
'com.docker.network.driver.foo': 'bar' 'com.docker.network.driver.foo': 'bar',
'com.docker.network.windowsshim.hnsid': 'aac3fd4887daaec1e3b',
} }
net = Network( net = Network(
None, 'compose_test', 'net1', 'overlay', None, 'compose_test', 'net1', 'overlay',