瀏覽代碼

Update docker-py

From https://github.com/bfirsh/docker-py/commit/0a9512d008b4b79d625aed360d9dc323ccc342d5
Ben Firshman 11 年之前
父節點
當前提交
1bab14213d
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      fig/packages/docker/client.py

+ 4 - 1
fig/packages/docker/client.py

@@ -708,8 +708,11 @@ class Client(requests.Session):
         start_config['PublishAllPorts'] = publish_all_ports
 
         if links:
+            if isinstance(links, dict):
+                links = six.iteritems(links)
+
             formatted_links = [
-                '{0}:{1}'.format(k, v) for k, v in sorted(six.iteritems(links))
+                '{0}:{1}'.format(k, v) for k, v in sorted(links)
             ]
 
             start_config['Links'] = formatted_links