tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4115 from shin-/fix_overlay_options_mismatch

Browse Source 
Call check_remote_network_config from Network.ensure
This commit is contained in:
Joffrey F 2016-11-08 15:35:38 -08:00 committed by GitHub
commit 0e28163ccb
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compose/network.py
View File

@ -53,14 +53,7 @@ class Network(object):
try:
data = self.inspect()
if self.driver and data['Driver'] != self.driver:
raise ConfigurationError(
'Network "{}" needs to be recreated - driver has changed'
.format(self.full_name))
if data['Options'] != (self.driver_opts or {}):
raise ConfigurationError(
'Network "{}" needs to be recreated - options have changed'
.format(self.full_name))
check_remote_network_config(data, self)
except NotFound:
driver_name = 'the default driver'
if self.driver: