-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
allow a local .env file to override compose.yaml sibling .env #11824
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
ndeloof
requested review from
a team,
glours,
milas and
jhrotko
and removed request for
a team
May 16, 2024 07:44
ndeloof
force-pushed
the
dotEnvStrikesBack
branch
from
May 16, 2024 08:08
1873276
to
16622fc
Compare
Signed-off-by: Nicolas De Loof <[email protected]>
ndeloof
force-pushed
the
dotEnvStrikesBack
branch
from
May 17, 2024 06:46
16622fc
to
38e42a4
Compare
jhrotko
approved these changes
May 21, 2024
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.
LGTM
Did you change the documentation to make it more clear? I remember you have mentioned it before just asking the current status |
@jhrotko I'll do once this PR is merged |
3 tasks
aequitas
added a commit
to internetstandards/Internet.nl
that referenced
this pull request
Jun 5, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824
aequitas
added a commit
to internetstandards/Internet.nl
that referenced
this pull request
Jun 5, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824
mxsasha
pushed a commit
to internetstandards/Internet.nl
that referenced
this pull request
Jun 13, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824
mxsasha
pushed a commit
to internetstandards/Internet.nl
that referenced
this pull request
Jun 17, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824
mxsasha
pushed a commit
to internetstandards/Internet.nl
that referenced
this pull request
Jul 24, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824 (cherry picked from commit 600e930)
mxsasha
pushed a commit
to internetstandards/Internet.nl
that referenced
this pull request
Aug 12, 2024
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824 (cherry picked from commit 600e930)
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
Allow local .env file both to set COMPOSE_* variables and override .env file aside the target compose.yaml file
This restores behavior seen in compose v2 before v2.24.x, while undocumented. Was initially introduced by #9512 while not designed for this usage, but users started then to rely on this "feature"
A doc PR will follow so this is well documented
Related issue
fixes #11823
fixes #11575
https://docker.atlassian.net/browse/COMP-570
(not mandatory) A picture of a cute animal, if possible in relation to what you did