diff --git a/cmd/ddev/cmd/config-global.go b/cmd/ddev/cmd/config-global.go index 33a5077526e..7217ded8ffd 100644 --- a/cmd/ddev/cmd/config-global.go +++ b/cmd/ddev/cmd/config-global.go @@ -259,9 +259,11 @@ func init() { configGlobalCommand.Flags().Bool("fail-on-hook-fail", false, "If true, 'ddev start' will fail when a hook fails.") configGlobalCommand.Flags().Bool("mutagen-enabled", false, "If true, web container will use mutagen caching/asynchronous updates.") configGlobalCommand.Flags().String("table-style", "", "Table style for list and describe, see ~/.ddev/global_config.yaml for values") - configGlobalCommand.Flags().String("required-docker-compose-version", "", "Override default docker-compose version") + configGlobalCommand.Flags().String("required-docker-compose-version", "", "Override default docker-compose version (used only in development testing)") + _ = configGlobalCommand.Flags().MarkHidden("required-docker-compose-version") configGlobalCommand.Flags().String("project-tld", "", "Override default project tld") - configGlobalCommand.Flags().Bool("use-docker-compose-from-path", true, "If true, use docker-compose from path instead of private ~/.ddev/bin/docker-compose") + configGlobalCommand.Flags().Bool("use-docker-compose-from-path", true, "If true, use docker-compose from path instead of private ~/.ddev/bin/docker-compose (used only in development testing)") + _ = configGlobalCommand.Flags().MarkHidden("use-docker-compose-from-path") configGlobalCommand.Flags().Bool("no-bind-mounts", true, "If true, don't use bind-mounts - useful for environments like remote docker where bind-mounts are impossible") configGlobalCommand.Flags().String("xdebug-ide-location", "", "For less usual IDE locations specify where the IDE is running for Xdebug to reach it") configGlobalCommand.Flags().String("router", types.RouterTypeTraefik, fmt.Sprintf("Valid router types are %s, default is %s", strings.Join(types.GetValidRouterTypes(), ", "), types.RouterTypeDefault)) diff --git a/docs/content/users/usage/commands.md b/docs/content/users/usage/commands.md index 9569a56738b..f03912eb6b6 100644 --- a/docs/content/users/usage/commands.md +++ b/docs/content/users/usage/commands.md @@ -237,11 +237,9 @@ ddev config global --omit-containers=ddev-ssh-agent * `--nfs-mount-enabled`: Enable NFS mounting on all projects globally. * `--no-bind-mounts`: If `true`, don’t use bind-mounts. Useful for environments like remote Docker where bind-mounts are impossible. (default is equal to `--no-bind-mounts=true`) * `--omit-containers`: For example, `--omit-containers=ddev-ssh-agent`. -* `--required-docker-compose-version`: Override default docker-compose version. * `--router-bind-all-interfaces`: `router-bind-all-interfaces=true`. * `--simple-formatting`: If `true`, use simple formatting and no color for tables. * `--table-style`: Table style for list and describe, see `~/.ddev/global_config.yaml` for values. -* `--use-docker-compose-from-path`: If `true`, use docker-compose from path instead of private `~/.ddev/bin/docker-compose`. (default is equal to `--use-docker-compose-from-path=true`) * `--use-hardened-images`: If `true`, use more secure 'hardened' images for an actual internet deployment. * `--use-letsencrypt`: Enables experimental Let’s Encrypt integration; `ddev global --use-letsencrypt` or `ddev global --use-letsencrypt=false`. * `--web-environment`: Set the environment variables in the web container: `--web-environment="TYPO3_CONTEXT=Development,SOMEENV=someval"`