restore support for --memory
#10492
Merged
restore support for --memory
#10492
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
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## v2 #10492 +/- ##
===========================================
- Coverage 59.90% 19.55% -40.35%
===========================================
Files 105 104 -1
Lines 9056 9102 +46
===========================================
- Hits 5425 1780 -3645
- Misses 3066 7135 +4069
+ Partials 565 187 -378
... and 72 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report in Codecov by Sentry. |
ndeloof
requested review from
a team,
nicksieger,
StefanScherer,
ulyssessouza,
glours,
milas and
laurazard
and removed request for
a team
ndeloof
force-pushed
the
build_memory
branch
3 times, most recently
from
98b6a28
to
e5c9941
Compare
milas
approved these changes
Apr 25, 2023
cmd/compose/build.go
Outdated
| @@ -125,8 +123,7 @@ func buildCommand(p *ProjectOptions, streams api.Streams, backend api.Service) * | |||
| cmd.Flags().BoolVar(&opts.noCache, "no-cache", false, "Do not use cache when building the image") | |||
| cmd.Flags().Bool("no-rm", false, "Do not remove intermediate containers after a successful build. DEPRECATED") | |||
| cmd.Flags().MarkHidden("no-rm") //nolint:errcheck | |||
| cmd.Flags().StringVarP(&opts.memory, "memory", "m", "", "Set memory limit for the build container. Not supported on buildkit yet.") | |||
| cmd.Flags().MarkHidden("memory") //nolint:errcheck | |||
| cmd.Flags().VarP(&opts.memory, "memory", "m", "Set memory limit for the build container. Not supported on buildkit yet.") | |||
There was a problem hiding this comment.
Suggested change
| cmd.Flags().VarP(&opts.memory, "memory", "m", "Set memory limit for the build container. Not supported on buildkit yet.") | |
| cmd.Flags().VarP(&opts.memory, "memory", "m", "Set memory limit for the build container. Not supported by BuildKit.") |
pkg/compose/build.go
Outdated
| @@ -102,6 +102,11 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| if options.Memory != 0 { | |||
| fmt.Fprintln(s.stderr(), "WARNING --memory is ignored as not supported in buildkit.") | |||
There was a problem hiding this comment.
Suggested change
| fmt.Fprintln(s.stderr(), "WARNING --memory is ignored as not supported in buildkit.") | |
| fmt.Fprintln(s.stderr(), "WARNING: --memory is not supported by BuildKit and will be ignored.") |
glours
approved these changes
Apr 25, 2023
ndeloof
force-pushed
the
build_memory
branch
3 times, most recently
from
2b3b704
to
e33986a
Compare
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What I did
restore support for
build --memoryon classic builder.This flag was hidden as initial design only supported buildkit, but as we introduced support for classic builder, there's no reason not so enable use of this flag
Related issue
closes #10488
(not mandatory) A picture of a cute animal, if possible in relation to what you did