فهرست منبع

Report Python and OpenSSL versions in --version output

Signed-off-by: Aanand Prasad <[email protected]>
Aanand Prasad 10 سال پیش
والد
کامیت
c571bb485d
3فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 3 1
      compose/cli/utils.py
  2. 1 1
      script/build-linux-inner
  3. 1 1
      script/build-osx

+ 3 - 1
compose/cli/utils.py

@@ -8,6 +8,7 @@ from docker import version as docker_py_version
 import os
 import platform
 import subprocess
+import ssl
 
 
 def yesno(prompt, default=None):
@@ -132,6 +133,7 @@ def get_version_info(scope):
     elif scope == 'full':
         return versioninfo + '\n' \
             + "docker-py version: %s\n" % docker_py_version \
-            + "%s version: %s" % (platform.python_implementation(), platform.python_version())
+            + "%s version: %s\n" % (platform.python_implementation(), platform.python_version()) \
+            + "OpenSSL version: %s" % ssl.OPENSSL_VERSION
     else:
         raise RuntimeError('passed unallowed value to `cli.utils.get_version_info`')

+ 1 - 1
script/build-linux-inner

@@ -7,4 +7,4 @@ chmod 777 `pwd`/dist
 
 pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Linux-x86_64
-dist/docker-compose-Linux-x86_64 --version
+dist/docker-compose-Linux-x86_64 version

+ 1 - 1
script/build-osx

@@ -7,4 +7,4 @@ venv/bin/pip install -r requirements-dev.txt
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/docker-compose
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
-dist/docker-compose-Darwin-x86_64 --version
+dist/docker-compose-Darwin-x86_64 version