Skip to content
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

[v4.6] fix(env): parsing --env incorrect in cli #19566

Conversation

TomSweeneyRedHat
Copy link
Member

Backports a last-minute issue found and corrected this morning
on environment variable handling. It didn't go cleanly, so I've
also backported two other recent commits to make it clean that
also are related. The commits in order of submission are:

feat(env): support multiline in env-filefeat(env): support multiline in env-file - 170a786
Check tty flag to set default terminal in Env - 53d44a6
fix(env): parsing --env incorrect in cli - 7ce654f

Signed-off-by: Black-Hole1 bh@bugs.cc
Signed-off-by: TomSweeneyRedHat tsweeney@redhat.com

Does this PR introduce a user-facing change?

Support multiline in `--env-file`

BlackHole1 and others added 3 commits August 9, 2023 10:23
Close: containers#18724

Signed-off-by: Black-Hole1 <bh@bugs.cc>
First, all the defaults for TERM=xterm were removed from c/common, then accordingly the same will be added if encountered a set tty flag.

Signed-off-by: Chetan Giradkar <cgiradka@redhat.com>
Backports a last minute issue found and corrected this morning
on environment variable handling.  It didn't go cleanly, so I've
also backported two other recent commits to make it clean that
also are related.  The commits in order of submission are:

feat(env): support multiline in env-filefeat(env): support multiline in env-file - containers@170a786
Check tty flag to set default terminal in Env - containers@53d44a6
fix(env): parsing --env incorrect in cli - containers@7ce654f

Signed-off-by: Black-Hole1 <bh@bugs.cc>
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2023
@TomSweeneyRedHat
Copy link
Member Author

@vrothberg @BlackHole1 PTAL

@vrothberg
Copy link
Member

vrothberg commented Aug 9, 2023

@edsantiago PTAL

Ed has found some more issues, so I prefer him to weigh in.

@edsantiago edsantiago added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/blocked-paths Indicates that a PR should not merge because it touches files in blocked paths. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. do-not-merge/needs-unit-tests do-not-merge/needs-integration-tests do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None do-not-merge/needs-confirmation Waiting for feedback from stakeholder before merging labels Aug 9, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None label Aug 9, 2023
@edsantiago
Copy link
Collaborator

Please do not merge this. #19096 never made it into 4.6, so this "fix" is not necessary. And, env-file is pretty badly broken IMO (#19565), we need to get it properly sorted out.

I may be mistaken, so I'm leaving this open but with lots of DO-NOT-MERGE tags. If someone believes this code is absolutely needed in 4.6, please correct me.

@BlackHole1
Copy link
Contributor

I agree with @edsantiago's perspective. Currently, there are some disagreements regarding the implementation of env-file. We should wait until we reach a consensus before making a decision.

@Luap99
Copy link
Member

Luap99 commented Aug 9, 2023

This should not get backported. It has a high risk of breakage which makes it not suitable for a patch release IMO.
We can figure out exact semantics for 4.7 as @edsantiago reported some problems.

@rhatdan
Copy link
Member

rhatdan commented Aug 9, 2023

I agree if there was no change in this functionality in 4.6 then it should NOT be back ported.

@TomSweeneyRedHat
Copy link
Member Author

Sold, I was backporting just based on Matt's note, and then what I thought was needed to keep the commits happy at the end. We'll leave this to 4.7 then. Thanks for the discussion.

@TomSweeneyRedHat TomSweeneyRedHat deleted the dev/tsweeney/cherrypick branch August 9, 2023 17:29
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Nov 8, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/blocked-paths Indicates that a PR should not merge because it touches files in blocked paths. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. do-not-merge/needs-confirmation Waiting for feedback from stakeholder before merging do-not-merge/needs-integration-tests do-not-merge/needs-unit-tests do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants