tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-19 19:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Report Python and OpenSSL versions in --version output

Browse Source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-05-28 17:18:04 +01:00
parent 8eb65ed946
commit c571bb485d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/cli/utils.py
View File

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

2
script/build-linux-inner
View File

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

2
script/build-osx
View File

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