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

Merge pull request #2466 from dnephin/remove_insecure_ssl_warning

Browse Source 
Removes the deprecated --allow-insecure-ssl flag
This commit is contained in:
Aanand Prasad 2015-12-07 14:29:33 +00:00
commit 9f4e83e456
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compose/cli/main.py
View File

@ -41,11 +41,6 @@ if not IS_WINDOWS_PLATFORM:
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
console_handler = logging.StreamHandler(sys.stderr) console_handler = logging.StreamHandler(sys.stderr)
INSECURE_SSL_WARNING = """
--allow-insecure-ssl is deprecated and has no effect.
It will be removed in a future version of Compose.
"""
def main(): def main():
setup_logging() setup_logging()
@ -303,11 +298,7 @@ class TopLevelCommand(DocoptCommand):
Options: Options:
--ignore-pull-failures Pull what it can and ignores images with pull failures. --ignore-pull-failures Pull what it can and ignores images with pull failures.
--allow-insecure-ssl Deprecated - no effect.
""" """
if options['--allow-insecure-ssl']:
log.warn(INSECURE_SSL_WARNING)
project.pull( project.pull(
service_names=options['SERVICE'], service_names=options['SERVICE'],
ignore_pull_failures=options.get('--ignore-pull-failures') ignore_pull_failures=options.get('--ignore-pull-failures')
@ -352,7 +343,6 @@ class TopLevelCommand(DocoptCommand):
Usage: run [options] [-p PORT...] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...] Usage: run [options] [-p PORT...] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]
Options: Options:
--allow-insecure-ssl Deprecated - no effect.
-d Detached mode: Run container in the background, print -d Detached mode: Run container in the background, print
new container name. new container name.
--name NAME Assign a name to the container --name NAME Assign a name to the container
@ -376,9 +366,6 @@ class TopLevelCommand(DocoptCommand):
"Please pass the -d flag when using `docker-compose run`." "Please pass the -d flag when using `docker-compose run`."
) )
if options['--allow-insecure-ssl']:
log.warn(INSECURE_SSL_WARNING)
if options['COMMAND']: if options['COMMAND']:
command = [options['COMMAND']] + options['ARGS'] command = [options['COMMAND']] + options['ARGS']
else: else:
@ -514,7 +501,6 @@ class TopLevelCommand(DocoptCommand):
Usage: up [options] [SERVICE...] Usage: up [options] [SERVICE...]
Options: Options:
--allow-insecure-ssl Deprecated - no effect.
-d Detached mode: Run containers in the background, -d Detached mode: Run containers in the background,
print new container names. print new container names.
--no-color Produce monochrome output. --no-color Produce monochrome output.
@ -528,9 +514,6 @@ class TopLevelCommand(DocoptCommand):
when attached or when containers are already when attached or when containers are already
running. (default: 10) running. (default: 10)
""" """
if options['--allow-insecure-ssl']:
log.warn(INSECURE_SSL_WARNING)
monochrome = options['--no-color'] monochrome = options['--no-color']
start_deps = not options['--no-deps'] start_deps = not options['--no-deps']
service_names = options['SERVICE'] service_names = options['SERVICE']

4
tests/unit/cli_test.py
View File

@ -102,7 +102,6 @@ class CLITestCase(unittest.TestCase):
'-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')], '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
'--user': None, '--user': None,
'--no-deps': None, '--no-deps': None,
'--allow-insecure-ssl': None,
'-d': True, '-d': True,
'-T': None, '-T': None,
'--entrypoint': None, '--entrypoint': None,
@ -132,7 +131,6 @@ class CLITestCase(unittest.TestCase):
'-e': [], '-e': [],
'--user': None, '--user': None,
'--no-deps': None, '--no-deps': None,
'--allow-insecure-ssl': None,
'-d': True, '-d': True,
'-T': None, '-T': None,
'--entrypoint': None, '--entrypoint': None,
@ -161,7 +159,6 @@ class CLITestCase(unittest.TestCase):
'-e': [], '-e': [],
'--user': None, '--user': None,
'--no-deps': None, '--no-deps': None,
'--allow-insecure-ssl': None,
'-d': True, '-d': True,
'-T': None, '-T': None,
'--entrypoint': None, '--entrypoint': None,
@ -193,7 +190,6 @@ class CLITestCase(unittest.TestCase):
'-e': [], '-e': [],
'--user': None, '--user': None,
'--no-deps': None, '--no-deps': None,
'--allow-insecure-ssl': None,
'-d': True, '-d': True,
'-T': None, '-T': None,
'--entrypoint': None, '--entrypoint': None,