mirror of
https://github.com/docker/compose.git
synced 2025-07-23 13:45:00 +02:00
Fixed network priorities. Resolves #5042
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
This commit is contained in:
parent
f50e1a8c2d
commit
55ee95b6d0
@ -282,6 +282,7 @@ def get_networks(service_dict, network_definitions):
|
|||||||
for name, netdef in get_network_defs_for_service(service_dict).items():
|
for name, netdef in get_network_defs_for_service(service_dict).items():
|
||||||
network = network_definitions.get(name)
|
network = network_definitions.get(name)
|
||||||
if network:
|
if network:
|
||||||
|
netdef['priority'] = network.priority
|
||||||
networks[network.full_name] = netdef
|
networks[network.full_name] = netdef
|
||||||
else:
|
else:
|
||||||
raise ConfigurationError(
|
raise ConfigurationError(
|
||||||
|
@ -575,6 +575,7 @@ class Service(object):
|
|||||||
container.id,
|
container.id,
|
||||||
network)
|
network)
|
||||||
|
|
||||||
|
print('Connecting to {}'.format(network))
|
||||||
self.client.connect_container_to_network(
|
self.client.connect_container_to_network(
|
||||||
container.id, network,
|
container.id, network,
|
||||||
aliases=self._get_aliases(netdefs, container),
|
aliases=self._get_aliases(netdefs, container),
|
||||||
|
@ -1276,15 +1276,9 @@ class CLITestCase(DockerClientTestCase):
|
|||||||
|
|
||||||
def test_up_ordered_networks(self):
|
def test_up_ordered_networks(self):
|
||||||
self.base_dir = 'tests/fixtures/networks'
|
self.base_dir = 'tests/fixtures/networks'
|
||||||
|
result = self.dispatch(['-f', 'ordered-networks.yml', 'up', '-d'])
|
||||||
|
|
||||||
self.dispatch(['-f', 'ordered-networks.yml', 'up', '-d'])
|
assert 'Connecting to networks_bar\nConnecting to networks_foo' in result.stdout
|
||||||
|
|
||||||
containers = self.project.get_service('web').containers()
|
|
||||||
|
|
||||||
for container in containers:
|
|
||||||
networks = container.get('NetworkSettings.Networks')
|
|
||||||
assert networks.keys()[0] == "networks_bar"
|
|
||||||
assert networks.keys()[1] == "networks_foo"
|
|
||||||
|
|
||||||
@v3_only()
|
@v3_only()
|
||||||
def test_up_with_healthcheck(self):
|
def test_up_with_healthcheck(self):
|
||||||
@ -1899,7 +1893,7 @@ class CLITestCase(DockerClientTestCase):
|
|||||||
result = self.dispatch(['run', 'simple'])
|
result = self.dispatch(['run', 'simple'])
|
||||||
|
|
||||||
if six.PY2: # Can't retrieve output on Py3. See issue #3670
|
if six.PY2: # Can't retrieve output on Py3. See issue #3670
|
||||||
assert value == result.stdout.strip()
|
assert value in result.stdout.strip()
|
||||||
|
|
||||||
container = self.project.containers(one_off=OneOffFilter.only, stopped=True)[0]
|
container = self.project.containers(one_off=OneOffFilter.only, stopped=True)[0]
|
||||||
environment = container.get('Config.Env')
|
environment = container.get('Config.Env')
|
||||||
|
2
tests/fixtures/networks/ordered-networks.yml
vendored
2
tests/fixtures/networks/ordered-networks.yml
vendored
@ -1,4 +1,4 @@
|
|||||||
version: "2"
|
version: "2.3"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user