Use format_environment to convert env in ContainerSpec

Signed-off-by: Simon Li <orpheus+devel@gmail.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/docker/types/services.py b/docker/types/services.py
index 2ac47eb..0ede776 100644
--- a/docker/types/services.py
+++ b/docker/types/services.py
@@ -39,6 +39,7 @@ class ContainerSpec(dict):
     def __init__(self, image, command=None, args=None, env=None, workdir=None,
                  user=None, labels=None, mounts=None, stop_grace_period=None):
         from ..utils import split_command  # FIXME: circular import
+        from ..utils import format_environment  # FIXME: circular import
 
         self['Image'] = image
 
@@ -48,7 +49,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:
diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py
index 5bd69b4..e834505 100644
--- a/docker/utils/__init__.py
+++ b/docker/utils/__init__.py
@@ -6,7 +6,7 @@ from .utils import (
     create_host_config, create_container_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,
+    convert_service_networks, format_environment,
 )
 
 from ..types import LogConfig, Ulimit