mirror of https://github.com/docker/docker-py.git
Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-patch-1
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
commit
88b733b0f4
|
@ -1,7 +1,7 @@
|
|||
import six
|
||||
|
||||
from .. import errors
|
||||
from ..utils import split_command
|
||||
from ..utils import format_environment, split_command
|
||||
|
||||
|
||||
class TaskTemplate(dict):
|
||||
|
@ -82,7 +82,10 @@ class ContainerSpec(dict):
|
|||
self['Args'] = args
|
||||
|
||||
if env is not None:
|
||||
self['Env'] = env
|
||||
if isinstance(env, dict):
|
||||
self['Env'] = format_environment(env)
|
||||
else:
|
||||
self['Env'] = env
|
||||
if workdir is not None:
|
||||
self['Dir'] = workdir
|
||||
if user is not None:
|
||||
|
|
|
@ -6,6 +6,7 @@ from .utils import (
|
|||
create_host_config, parse_bytes, ping_registry, parse_env_file, version_lt,
|
||||
version_gte, decode_json_header, split_command, create_ipam_config,
|
||||
create_ipam_pool, parse_devices, normalize_links, convert_service_networks,
|
||||
format_environment
|
||||
)
|
||||
|
||||
from .decorators import check_resource, minimum_version, update_headers
|
||||
|
|
|
@ -231,3 +231,19 @@ class ServiceTest(BaseAPIIntegrationTest):
|
|||
'PublishedPort': 12357, 'TargetPort': 1990, 'Protocol': 'udp'
|
||||
} in ports
|
||||
assert len(ports) == 3
|
||||
|
||||
def test_create_service_with_env(self):
|
||||
container_spec = docker.types.ContainerSpec(
|
||||
'busybox', ['true'], env={'DOCKER_PY_TEST': 1}
|
||||
)
|
||||
task_tmpl = docker.types.TaskTemplate(
|
||||
container_spec,
|
||||
)
|
||||
name = self.get_service_name()
|
||||
svc_id = self.client.create_service(task_tmpl, name=name)
|
||||
svc_info = self.client.inspect_service(svc_id)
|
||||
assert 'TaskTemplate' in svc_info['Spec']
|
||||
assert 'ContainerSpec' in svc_info['Spec']['TaskTemplate']
|
||||
con_spec = svc_info['Spec']['TaskTemplate']['ContainerSpec']
|
||||
assert 'Env' in con_spec
|
||||
assert con_spec['Env'] == ['DOCKER_PY_TEST=1']
|
||||
|
|
Loading…
Reference in New Issue