-
-
Notifications
You must be signed in to change notification settings - Fork 587
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: use real path to global config location, fixes #6328 #6329
fix: use real path to global config location, fixes #6328 #6329
Conversation
Download the artifacts for this pull request:
See Testing a PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fantastic, thanks. Thanks for catching the other related things. I haven't manually tested yet.
configGlobalCommand.Flags().Bool("disable-http2", false, "Optionally disable http2 in deprecated nginx-proxy ddev-router, 'ddev global --disable-http2' or `ddev global --disable-http2=false'") | ||
configGlobalCommand.Flags().Bool("use-letsencrypt", false, "Enables experimental Let's Encrypt integration, 'ddev global --use-letsencrypt' or `ddev global --use-letsencrypt=false'") | ||
configGlobalCommand.Flags().String("letsencrypt-email", "", "Email associated with Let's Encrypt, `ddev global --letsencrypt-email=me@example.com'") | ||
configGlobalCommand.Flags().Bool("disable-http2", false, "Optionally disable http2 in deprecated nginx-proxy ddev-router, 'ddev config global --disable-http2' or `ddev config global --disable-http2=false'") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh nice catch(es)!
configGlobalCommand.Flags().Bool("simple-formatting", false, "If true, use simple formatting and no color for tables") | ||
configGlobalCommand.Flags().Bool("use-hardened-images", false, "If true, use more secure 'hardened' images for an actual internet deployment.") | ||
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().MarkDeprecated("mutagen-enabled", fmt.Sprintf("please use --%s instead", configTypes.FlagPerformanceModeName)) | ||
configGlobalCommand.Flags().String(configTypes.FlagPerformanceModeName, configTypes.FlagPerformanceModeDefault, configTypes.FlagPerformanceModeDescription(configTypes.ConfigTypeGlobal)) | ||
configGlobalCommand.Flags().Bool(configTypes.FlagPerformanceModeResetName, true, configTypes.FlagPerformanceModeResetDescription(configTypes.ConfigTypeGlobal)) | ||
configGlobalCommand.Flags().String("table-style", "", "Table style for list and describe, see ~/.ddev/global_config.yaml for values") | ||
configGlobalCommand.Flags().String("table-style", "", fmt.Sprintf("Table style for list and describe, see %s for values", fileutil.ShortHomeJoin(globalconfig.GetGlobalConfigPath()))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Manually tested, looks great. Thanks for fixing the broken missing config global
stuff.
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 (used only in development testing)") | ||
configGlobalCommand.Flags().Bool("use-docker-compose-from-path", true, fmt.Sprintf("If true, use docker-compose from path instead of private %s (used only in development testing)", fileutil.ShortHomeJoin(globalconfig.GetDDEVBinDir(), "docker-compose"))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fine and glad you caught it. But it's probably time for us to remove or hide this option. Pretty sure it's obsolete.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember there was a discussion about what to do with it, and it was hidden as a result.
I decided to update the description to be consistent even if users don't see it.
* docs: Warn about Codespaces (ddev#6321) [skip ci] Co-authored-by: Matthias Andrasch <777278+mandrasch@users.noreply.github.com> * docs: Improve ddev debug test by offering suggestions early [skip ci] (ddev#6323) * feat: add support for MariaDB 11.4 LTS, fixes ddev#6061 (ddev#6243) Co-authored-by: Stanislav Zhuk <stasadev@gmail.com> * docs: pacify textlint on mysql/https (ddev#6336) [skip ci] * docs: revisit WSL Docker Desktop setup instructions (ddev#6330) * fix: autodownload yarn from corepack, and set cache-folder, fixes ddev#6332 (ddev#6333) * docs: windows-wsl2-dd needs apt install for ngrok (ddev#6341) [skip ci] * build: check docker-compose 2.28.1 (ddev#6340) [skip ci] * fix: use real path to global config location, fixes ddev#6328 (ddev#6329) * test: stop running nightly tests [skip ci] (ddev#6347) * test: Improve reliability of TestProcessHooks (intermittent failures), fixes ddev#6313 (ddev#6314) * fix: Drupal 10 and Drupal 11 settings have migrated, set state_cache (ddev#6346) [skip ci] Co-authored-by: Stanislav Zhuk <stasadev@gmail.com> * build: use IPv4 inside a container, mariadb-client 11.4 for the webserver (ddev#6334) [skip ci] * fix: pass all valid options to nested commands in `ddev composer create`, fixes ddev#6300, fixes ddev#6246, for ddev#5058 (ddev#6303) Co-authored-by: Randy Fay <randy@randyfay.com> Co-authored-by: Ralf Koller <1665422+rpkoller@users.noreply.github.com> * docs: fix up textlint complaints * Turn off defaultTerms * Use exclude properly with textlint for VS Code * update for additional textlint complaints * remove redundant empty exclude section * Try to get textlint/reviewdog to report --------- Co-authored-by: Matthias Andrasch <777278+mandrasch@users.noreply.github.com> Co-authored-by: hussainweb <hussainweb@gmail.com> Co-authored-by: Stanislav Zhuk <stasadev@gmail.com> Co-authored-by: Ralf Koller <1665422+rpkoller@users.noreply.github.com>
The Issue
ddev list
should show correct location of router configuration #6328How This PR Solves The Issue
Introduces a new function to replace
$HOME
with~
.Fixes the output.
Manual Testing Instructions
Automated Testing Overview
Release/Deployment Notes