docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Full support to networking config during container creation 

Signed-off-by: Mariano Scazzariello <marianoscazzariello@gmail.com>
This commit is contained in:
Mariano Scazzariello 2023-05-06 13:49:01 +02:00
parent 576e47aaac
commit 1d697680d2
No known key found for this signature in database
GPG Key ID: 95C376C0221294BF
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
docker/models/containers.py
View File

@ -8,7 +8,7 @@ from ..errors import (
ContainerError, DockerException, ImageNotFound, ContainerError, DockerException, ImageNotFound,
NotFound, create_unexpected_kwargs_error NotFound, create_unexpected_kwargs_error
) )
from ..types import HostConfig from ..types import EndpointConfig, HostConfig, NetworkingConfig
from ..utils import version_gte from ..utils import version_gte
from .images import Image from .images import Image
from .resource import Collection, Model from .resource import Collection, Model
@ -680,10 +680,32 @@ class ContainerCollection(Collection):
This mode is incompatible with ``ports``. This mode is incompatible with ``ports``.
Incompatible with ``network``. Incompatible with ``network``.
network_driver_opt (dict): A dictionary of options to provide network_config (dict): A dictionary containing options that are
to the network driver. Defaults to ``None``. Used in passed to the network driver during the connection.
conjuction with ``network``. Incompatible Defaults to ``None``.
with ``network_mode``. The dictionary contains the following keys:
- ``aliases`` (:py:class:`list`): A list of aliases for
the network endpoint.
Names in that list can be used within the network to
reach this container. Defaults to ``None``.
- ``links`` (:py:class:`list`): A list of links for
the network endpoint endpoint.
Containers declared in this list will be linked to this
container. Defaults to ``None``.
- ``ipv4_address`` (str): The IP address to assign to
this container on the network, using the IPv4 protocol.
Defaults to ``None``.
- ``ipv6_address`` (str): The IP address to assign to
this container on the network, using the IPv6 protocol.
Defaults to ``None``.
- ``link_local_ips`` (:py:class:`list`): A list of link-local
(IPv4/IPv6) addresses.
- ``driver_opt`` (dict): A dictionary of options to provide to
the network driver. Defaults to ``None``.
Used in conjuction with ``network``.
Incompatible with ``network_mode``.
oom_kill_disable (bool): Whether to disable OOM killer. oom_kill_disable (bool): Whether to disable OOM killer.
oom_score_adj (int): An integer value containing the score given oom_score_adj (int): An integer value containing the score given
to the container in order to tune OOM killer preferences. to the container in order to tune OOM killer preferences.
@ -1124,12 +1146,16 @@ def _create_container_args(kwargs):
host_config_kwargs['binds'] = volumes host_config_kwargs['binds'] = volumes
network = kwargs.pop('network', None) network = kwargs.pop('network', None)
network_driver_opt = kwargs.pop('network_driver_opt', None) network_config = kwargs.pop('network_config', None)
if network: if network:
network_configuration = {'driver_opt': network_driver_opt} \ network_configuration = EndpointConfig(
if network_driver_opt else None host_config_kwargs['version'],
**network_config
) if network_config else None
create_kwargs['networking_config'] = {network: network_configuration} create_kwargs['networking_config'] = NetworkingConfig(
{network: network_configuration}
)
host_config_kwargs['network_mode'] = network host_config_kwargs['network_mode'] = network
# All kwargs should have been consumed by this point, so raise # All kwargs should have been consumed by this point, so raise