Fix COMPOSE_PROJECT_NAME variable parsing order regression #805
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
In a previous change (9d5b255) the support to read `COMPOSE_PROJECT_NAME` from the `name` attribute in the `compose.yml` file was added. Since the attribute is only available after parsing the compose file, the resolution of the variable was done afterwards. The variable is therefore usable inside the container, HOWEVER it can no longer be used for substitution while loading the compose file. Values that depend on this variable are therefore empty at the point of parsing the compose file. `COMPOSE_PROJECT_NAME` is either loaded from the environment or set to `dir_basename` by default. This commit changes the order of parsing `COMPOSE_PROJECT_NAME ` variable. First the compose file is loaded into a dict, then the single `name` attribute is evaluated and replaced, then if it does not exist, the default value is used. Signed-off-by: NKay <[email protected]>
p12tic
requested changes
Mar 8, 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.
In a previous change (9d5b255) the support to read
COMPOSE_PROJECT_NAMEfrom thenameattribute in thecompose.ymlfile was added. Since the attribute is only available after parsing the compose file, the resolution of the variable was done afterwards.The variable is therefore usable inside the container, HOWEVER it can no longer be used for substitution while loading the compose file. Values that depend on this variable are therefore empty at the point of parsing the compose file.
COMPOSE_PROJECT_NAMEis either loaded from the environment or set todir_basenameby default.This commit changes the order of parsing
COMPOSE_PROJECT_NAMEvariable. First the compose file is loaded into a dict, then the singlenameattribute is evaluated and replaced, then if it does not exist, the default value is used.