bin/docker: fix broken escaping and variable substitution #24793
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
openshift-ci
bot
added
the
do-not-merge/work-in-progress
In containers#24034 more variables were added to the envsubst input, but there is no escaping with envsubst, so the resulting bash script never used XDG_CONFIG_HOME. Also it replaced HOME with the build time HOME env var breaking the runtime subsitution, resulting in something bogus like: [ -e "\${XDG_CONFIG_HOME-\/home/build/.config}/containers/nodocker" ] Fix by telling envsubst to just replace BINDIR and ETCDIR and remove the broken escaping in the envsubst input. Signed-off-by: Christoph Reiter <[email protected]>
lazka
force-pushed
the
fix-docker-envsubst
branch
from
9e52dc0 to
9c14d15
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
(I assume there is no way to test this in the test suite? regarding the CI/label etc.) |
giuseppe
added
the
No New Tests
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe, lazka The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/lgtm |
|
Thanks @lazka |
|
thanks! |
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 #24034 more variables were added to the envsubst input, but there is no escaping with envsubst, so the resulting bash script never used XDG_CONFIG_HOME. Also it replaced HOME with the build time HOME env var breaking the runtime subsitution, resulting in something bogus like:
[ -e "\${XDG_CONFIG_HOME-\/home/build/.config}/containers/nodocker" ]Fix by telling envsubst to just replace BINDIR and ETCDIR (double $$ for make escaping) and remove the broken escaping in the envsubst input.
Does this PR introduce a user-facing change?