瀏覽代碼

Merge pull request #7563 from aiordache/validate_context_endpoint

Error out when context target is not a docker engine
Ulysses Souza 5 年之前
父節點
當前提交
15c1cabdad
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 5 0
      compose/cli/docker_client.py
  2. 1 1
      requirements.txt

+ 5 - 0
compose/cli/docker_client.py

@@ -140,6 +140,11 @@ def docker_client(environment, version=None, context=None, tls_version=None):
         if tls:
             context.set_endpoint("docker", host=host, tls_cfg=tls, skip_tls_verify=not verify)
 
+    if not context.is_docker_host():
+        raise UserError(
+            "The platform targeted with the current context is not supported.\n"
+            "Make sure the context in use targets a Docker Engine.\n")
+
     kwargs['base_url'] = context.Host
     if context.TLSConfig:
         kwargs['tls'] = context.TLSConfig

+ 1 - 1
requirements.txt

@@ -4,7 +4,7 @@ certifi==2020.6.20
 chardet==3.0.4
 colorama==0.4.3; sys_platform == 'win32'
 distro==1.5.0
-docker==4.2.1
+docker==4.2.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2