mirror of
https://github.com/docker/compose.git
synced 2025-07-22 05:04:27 +02:00
Advertise docker compose
for non linux users
This adds messages on: - Root command (only `docker-compose`) - Command not found - `help` command Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
parent
89ad637d50
commit
1da4301650
@ -23,6 +23,7 @@ from ..config import resolve_build_args
|
|||||||
from ..config.environment import Environment
|
from ..config.environment import Environment
|
||||||
from ..config.serialize import serialize_config
|
from ..config.serialize import serialize_config
|
||||||
from ..config.types import VolumeSpec
|
from ..config.types import VolumeSpec
|
||||||
|
from ..const import IS_LINUX_PLATFORM
|
||||||
from ..const import IS_WINDOWS_PLATFORM
|
from ..const import IS_WINDOWS_PLATFORM
|
||||||
from ..errors import StreamParseError
|
from ..errors import StreamParseError
|
||||||
from ..metrics.decorator import metrics
|
from ..metrics.decorator import metrics
|
||||||
@ -78,6 +79,8 @@ def main(): # noqa: C901
|
|||||||
try:
|
try:
|
||||||
command_func = dispatch()
|
command_func = dispatch()
|
||||||
command_func()
|
command_func()
|
||||||
|
if not IS_LINUX_PLATFORM and command == 'help':
|
||||||
|
print("\nDocker Compose is now in the Docker CLI, try `docker compose` help")
|
||||||
except (KeyboardInterrupt, signals.ShutdownException):
|
except (KeyboardInterrupt, signals.ShutdownException):
|
||||||
exit_with_metrics(command, "Aborting.", status=Status.FAILURE)
|
exit_with_metrics(command, "Aborting.", status=Status.FAILURE)
|
||||||
except (UserError, NoSuchService, ConfigurationError,
|
except (UserError, NoSuchService, ConfigurationError,
|
||||||
@ -98,6 +101,8 @@ def main(): # noqa: C901
|
|||||||
e.service.name), status=Status.FAILURE)
|
e.service.name), status=Status.FAILURE)
|
||||||
except NoSuchCommand as e:
|
except NoSuchCommand as e:
|
||||||
commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
|
commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
|
||||||
|
if not IS_LINUX_PLATFORM:
|
||||||
|
commands += "\n\nDocker Compose is now in the Docker CLI, try `docker compose`"
|
||||||
exit_with_metrics(e.command, "No such command: {}\n\n{}".format(e.command, commands))
|
exit_with_metrics(e.command, "No such command: {}\n\n{}".format(e.command, commands))
|
||||||
except (errors.ConnectionError, StreamParseError):
|
except (errors.ConnectionError, StreamParseError):
|
||||||
exit_with_metrics(command, status=Status.FAILURE)
|
exit_with_metrics(command, status=Status.FAILURE)
|
||||||
@ -116,6 +121,10 @@ def main(): # noqa: C901
|
|||||||
code = 0
|
code = 0
|
||||||
if isinstance(e.code, int):
|
if isinstance(e.code, int):
|
||||||
code = e.code
|
code = e.code
|
||||||
|
|
||||||
|
if not IS_LINUX_PLATFORM and not command:
|
||||||
|
msg += "\n\nDocker Compose is now in the Docker CLI, try `docker compose`"
|
||||||
|
|
||||||
exit_with_metrics(command, log_msg=msg, status=status,
|
exit_with_metrics(command, log_msg=msg, status=status,
|
||||||
exit_code=code)
|
exit_code=code)
|
||||||
|
|
||||||
@ -1123,6 +1132,9 @@ class TopLevelCommand:
|
|||||||
attach_dependencies = options.get('--attach-dependencies')
|
attach_dependencies = options.get('--attach-dependencies')
|
||||||
keep_prefix = not options.get('--no-log-prefix')
|
keep_prefix = not options.get('--no-log-prefix')
|
||||||
|
|
||||||
|
if not IS_LINUX_PLATFORM:
|
||||||
|
print('Docker Compose is now in the Docker CLI, try `docker compose up`\n')
|
||||||
|
|
||||||
if detached and (cascade_stop or exit_value_from or attach_dependencies):
|
if detached and (cascade_stop or exit_value_from or attach_dependencies):
|
||||||
raise UserError(
|
raise UserError(
|
||||||
"-d cannot be combined with --abort-on-container-exit or --attach-dependencies.")
|
"-d cannot be combined with --abort-on-container-exit or --attach-dependencies.")
|
||||||
|
@ -5,6 +5,7 @@ from .version import ComposeVersion
|
|||||||
DEFAULT_TIMEOUT = 10
|
DEFAULT_TIMEOUT = 10
|
||||||
HTTP_TIMEOUT = 60
|
HTTP_TIMEOUT = 60
|
||||||
IS_WINDOWS_PLATFORM = (sys.platform == "win32")
|
IS_WINDOWS_PLATFORM = (sys.platform == "win32")
|
||||||
|
IS_LINUX_PLATFORM = (sys.platform == "linux")
|
||||||
LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
|
LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
|
||||||
LABEL_ONE_OFF = 'com.docker.compose.oneoff'
|
LABEL_ONE_OFF = 'com.docker.compose.oneoff'
|
||||||
LABEL_PROJECT = 'com.docker.compose.project'
|
LABEL_PROJECT = 'com.docker.compose.project'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user