This repository has been archived by the owner on Nov 27, 2023. It is now read-only.
Fix --project-directory mix with --workdir #1353
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ulysses Souza <[email protected]>
gtardif
reviewed
Feb 26, 2021
| @@ -41,8 +41,7 @@ func (o *projectOptions) addProjectFlags(f *pflag.FlagSet) { | |||
| f.StringVarP(&o.ProjectName, "project-name", "p", "", "Project name") | |||
| f.StringArrayVarP(&o.ConfigPaths, "file", "f", []string{}, "Compose configuration files") | |||
| f.StringVar(&o.EnvFile, "env-file", "", "Specify an alternate environment file.") | |||
| f.StringVar(&o.WorkingDir, "workdir", "", "Specify an alternate working directory") | |||
| // TODO make --project-directory an alias | |||
| f.StringVar(&o.ProjectDir, "project-directory", "", "Specify an alternate working directory\n(default: the path of the Compose file)") | |||
There was a problem hiding this comment.
unfortunately we can't just break existing usage on ACI/ECS like this I think, we'll need to keep workdir an alias of this flag (confusing with the exec one I agree, but... we can put project-directory in front more visible of course, just support running with the --workdir alias)
There was a problem hiding this comment.
I understand it's a breaking change, but that's actually a bug fix.
The problem is that in the case of exec and run we can use both at the same time. So in this case it's broken.
ndeloof
suggested changes
Mar 1, 2021
This also checks for conflicts with --project-directory at `docker compose` command level Signed-off-by: Ulysses Souza <[email protected]>
ndeloof
approved these changes
Mar 1, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the ambiguity between
--project-directoryand--workdir--project-directoryis the one passed tocompose-goto resolve compose files--workdiris passed to commandsrunandexecto provide $PWD to the container before running the command.Resolves #1279