Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions docker/models/containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ContainerError, DockerException, ImageNotFound,
NotFound, create_unexpected_kwargs_error
)
from ..types import HostConfig
from ..types import (HostConfig, NetworkingConfig, EndpointConfig)
from ..utils import version_gte
from .images import Image
from .resource import Collection, Model
Expand Down Expand Up @@ -644,6 +644,8 @@ def run(self, image, command=None, stdout=True, stderr=False,
- ``host`` Use the host network stack.

Incompatible with ``network``.
network_alias (list): A list of hostnames that the container will
be available under.
oom_kill_disable (bool): Whether to disable OOM killer.
oom_score_adj (int): An integer value containing the score given
to the container in order to tune OOM killer preferences.
Expand Down Expand Up @@ -1066,7 +1068,15 @@ def _create_container_args(kwargs):

network = kwargs.pop('network', None)
if network:
create_kwargs['networking_config'] = {network: None}
network_alias = kwargs.pop('network_alias', None)
endpoint_config = None
if network_alias:
endpoint_config = EndpointConfig(
host_config_kwargs['version'],
aliases=network_alias)

create_kwargs['networking_config'] = NetworkingConfig(
{network: endpoint_config})
host_config_kwargs['network_mode'] = network

# All kwargs should have been consumed by this point, so raise
Expand Down
5 changes: 5 additions & 0 deletions tests/integration/models_containers_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def test_run_with_network(self):

container = client.containers.run(
'alpine', 'echo hello world', network=net_name,
network_alias=['alias1', 'alias2'],
detach=True
)
self.tmp_containers.append(container.id)
Expand All @@ -103,6 +104,10 @@ def test_run_with_network(self):
assert 'NetworkSettings' in attrs
assert 'Networks' in attrs['NetworkSettings']
assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name]
assert 'alias1' in attrs['NetworkSettings']['Networks'][
net_name]['Aliases']
assert 'alias2' in attrs['NetworkSettings']['Networks'][
net_name]['Aliases']

def test_run_with_none_driver(self):
client = docker.from_env(version=TEST_API_VERSION)
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/models_containers_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def test_create_container_args(self):
name='somename',
network_disabled=False,
network='foo',
network_alias=['bar', 'baz'],
oom_kill_disable=True,
oom_score_adj=5,
pid_mode='host',
Expand Down Expand Up @@ -185,7 +186,8 @@ def test_create_container_args(self):
mac_address='abc123',
name='somename',
network_disabled=False,
networking_config={'foo': None},
networking_config={'EndpointsConfig': {'foo': {'Aliases':
['bar', 'baz']}}},
ports=[('1111', 'tcp'), ('2222', 'tcp')],
stdin_open=True,
stop_signal=9,
Expand Down