-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Add --prune for up command
#12642
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
Closed
Closed
Add --prune for up command
#12642
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,7 @@ type upOptions struct { | |
| wait bool | ||
| waitTimeout int | ||
| watch bool | ||
| prune bool | ||
| navigationMenu bool | ||
| navigationMenuChanged bool | ||
| } | ||
|
|
@@ -170,6 +171,7 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *c | |
| flags.BoolVar(&up.wait, "wait", false, "Wait for services to be running|healthy. Implies detached mode.") | ||
| flags.IntVar(&up.waitTimeout, "wait-timeout", 0, "Maximum duration in seconds to wait for the project to be running|healthy") | ||
| flags.BoolVarP(&up.watch, "watch", "w", false, "Watch source code and rebuild/refresh containers when files are updated.") | ||
| flags.BoolVar(&up.prune, "prune", false, "Prune dangling images on rebuild") | ||
| flags.BoolVar(&up.navigationMenu, "menu", false, "Enable interactive shortcuts when running attached. Incompatible with --detach. Can also be enable/disable by setting COMPOSE_MENU environment var.") | ||
|
|
||
| return upCmd | ||
|
|
@@ -207,6 +209,9 @@ func validateFlags(up *upOptions, create *createOptions) error { | |
| if create.noBuild && up.watch { | ||
| return fmt.Errorf("--no-build and --watch are incompatible") | ||
| } | ||
| if !up.watch && up.prune { | ||
| return fmt.Errorf("--prune can only be used with --watch") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -310,6 +315,7 @@ func runUp( | |
| Wait: upOptions.wait, | ||
| WaitTimeout: timeout, | ||
| Watch: upOptions.watch, | ||
| Prune: upOptions.prune, | ||
|
Comment on lines
317
to
+318
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if we should not pass directly
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should just drop the |
||
| Services: services, | ||
| NavigationMenu: upOptions.navigationMenu && ui.Mode != "plain", | ||
| }, | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
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 wonder: is there any benefits not pruning those ? Shall we just make this the default ? Then do we need a flag ?
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.
Yep, I agree
@remcokranenburg do you mind adapting your PR to prune by default? We just need to keep it for the
watchcommand itself to let users who want it to choose the option of keeping dangling imagesThere 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.
Sure! Would you also like to prune by default for the
watchcommand? That might be more consistent, thus less surprising.By keeping the flag, it should be possible to disable in either
uporwatchwith--prune=0There 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.
up already has so much flags we'd prefer not to have more. For those who really want to keep dangling images (?)
watch --prune=falsecould be a reasonable workaroundThere 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.
Yes I'm aligned with @ndeloof on this one, just keep the
--pruneflag for thewatchcommandBTW thank you for doing it 🙏