restore setEnvWithDotEnv #11974
Merged
restore setEnvWithDotEnv #11974
+92
−11
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
258b86e
to
68d5d03
Compare
Signed-off-by: Nicolas De Loof <[email protected]>
jhrotko
reviewed
Jul 9, 2024
| // isOrphaned is a predicate to select containers without a matching service definition in compose project | ||
| func isOrphaned(project *types.Project) containerPredicate { | ||
| services := append(project.ServiceNames(), project.DisabledServiceNames()...) | ||
| return func(c moby.Container) bool { | ||
| // One-off container | ||
| v, ok := c.Labels[api.OneoffLabel] |
There was a problem hiding this comment.
question: what is the oneOffLabel?
There was a problem hiding this comment.
this is used to distinguish containers created by docker compose run vs actual services created by up
jhrotko
reviewed
Jul 9, 2024
| @@ -37,7 +37,7 @@ func TestLocalComposeRun(t *testing.T) { | |||
| "Hello one more time") | |||
| lines = Lines(res.Stdout()) | |||
| assert.Equal(t, lines[len(lines)-1], "Hello one more time", res.Stdout()) | |||
| assert.Assert(t, !strings.Contains(res.Combined(), "orphan")) | |||
| assert.Assert(t, strings.Contains(res.Combined(), "orphan")) | |||
There was a problem hiding this comment.
question: was this a bug before your chnages? :o
There was a problem hiding this comment.
more or less. We only considered "orphans" for service container not declared in current compose model. This PR also consider stopped run containers as orphaned
glours
approved these changes
Jul 11, 2024
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
setEnvWithDotEnvto load .env into os.Env so the many places we rely on os.LookupEnv aren't borkenthis also restore support for configuring buildx using env var set in .env
includes e2e test + a tiny fix to include (stopped) one-off containers as "orphans"
Related issue
closes #11967
(not mandatory) A picture of a cute animal, if possible in relation to what you did
