Skip to content

Commit

Permalink
refactor: hide --required-docker-compose-version and --use-docker-com…
Browse files Browse the repository at this point in the history
…pose-from-path from global config, fixes ddev#4607 (ddev#5039)
  • Loading branch information
rfay authored Jun 28, 2023
1 parent b745b5f commit 8f6b374
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 4 additions & 2 deletions cmd/ddev/cmd/config-global.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions docs/content/users/usage/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down

0 comments on commit 8f6b374

Please sign in to comment.