Set engine env from common config #6790
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
openshift-ci-robot
added
the
do-not-merge/work-in-progress
QiWang19
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
rhatdan
reviewed
Jul 2, 2020
| value := "" | ||
| if len(splitEnv) == 2 { | ||
| value = splitEnv[1] | ||
| } |
There was a problem hiding this comment.
If it is not 2, this should also be an error.
There was a problem hiding this comment.
I see what you did, but users might accidentally override an existing environement variable with nothing.
If they want nothing then they should set it
foo=""
QiWang19
force-pushed
the
set_engine_env
branch
2 times, most recently
from
38b7929 to
11b5bec
Compare
mheon
reviewed
Jul 2, 2020
| @@ -128,6 +128,16 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error { | |||
| return err | |||
| } | |||
|
|
|||
| for _, env := range cfg.Engine.Env { | |||
| splitEnv := strings.SplitN(env, "=", 2) | |||
There was a problem hiding this comment.
Do we want this to take precedence over actual OS environment? I imagine that if I have something set in containers.conf but later do a ENVVAR=value podman run ... I want the version passed there to take precedence.
If so, we should only define environment variables that are not already defined.
There was a problem hiding this comment.
Yes I guess that makes sense. @QiWang19 Please add a note to the man pages on podman (buildah) about this, also, just do a check to see if environment is set, it set write a debug message, if different, and don't override,
giuseppe
reviewed
Jul 2, 2020
QiWang19
force-pushed
the
set_engine_env
branch
2 times, most recently
from
456f9ef to
6797511
Compare
Set the env that is used by Podman. related issue containers/common#31 Signed-off-by: Qi Wang <[email protected]>
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: QiWang19, rhatdan 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-robot
added
the
approved
QiWang19
added a commit
to QiWang19/buildah
that referenced
this pull request
Jul 10, 2020
Set engine env from containrs.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]>
QiWang19
added a commit
to QiWang19/buildah
that referenced
this pull request
Jul 13, 2020
Set engine env from containers.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]>
QiWang19
added a commit
to QiWang19/buildah
that referenced
this pull request
Jul 14, 2020
Set engine env from containers.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]>
QiWang19
added a commit
to QiWang19/buildah
that referenced
this pull request
Jul 14, 2020
Set engine env from containers.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]>
bors bot
added a commit
to containers/buildah
that referenced
this pull request
Jul 15, 2020
2457: Set engine env from containers.conf r=rhatdan a=QiWang19 Set engine env from containrs.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]> <!-- Thanks for sending a pull request! Please make sure you've read and understood our contributing guidelines (https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring that all your commits are signed with `git commit -s`. --> #### What type of PR is this? <!-- Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. Uncomment only one `/kind <>` line, hit enter to put that in a new line, and remove leading whitespace from that line: --> > /kind api-change > /kind bug > /kind cleanup > /kind deprecation > /kind design > /kind documentation > /kind failing-test > /kind feature > /kind flake > /kind other #### What this PR does / why we need it: #### How to verify it #### Which issue(s) this PR fixes: <!-- Automatically closes linked issue when PR is merged. Uncomment the following comment block and include the issue number or None on one line. Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`. --> <!-- Fixes # or None --> #### Special notes for your reviewer: #### Does this PR introduce a user-facing change? <!-- If no, just write `None` in the release-note block below. If yes, a release note is required: Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required". For more information on release notes please follow the kubernetes model: https://git.k8s.io/community/contributors/guide/release-notes.md --> ```release-note ``` Co-authored-by: Qi Wang <[email protected]>
bors bot
added a commit
to containers/buildah
that referenced
this pull request
Jul 15, 2020
2457: Set engine env from containers.conf r=rhatdan a=QiWang19 Set engine env from containrs.conf. Mirror podman PR containers/podman#6790. Signed-off-by: Qi Wang <[email protected]> <!-- Thanks for sending a pull request! Please make sure you've read and understood our contributing guidelines (https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring that all your commits are signed with `git commit -s`. --> #### What type of PR is this? <!-- Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. Uncomment only one `/kind <>` line, hit enter to put that in a new line, and remove leading whitespace from that line: --> > /kind api-change > /kind bug > /kind cleanup > /kind deprecation > /kind design > /kind documentation > /kind failing-test > /kind feature > /kind flake > /kind other #### What this PR does / why we need it: #### How to verify it #### Which issue(s) this PR fixes: <!-- Automatically closes linked issue when PR is merged. Uncomment the following comment block and include the issue number or None on one line. Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`. --> <!-- Fixes # or None --> #### Special notes for your reviewer: #### Does this PR introduce a user-facing change? <!-- If no, just write `None` in the release-note block below. If yes, a release note is required: Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required". For more information on release notes please follow the kubernetes model: https://git.k8s.io/community/contributors/guide/release-notes.md --> ```release-note ``` Co-authored-by: Qi Wang <[email protected]>
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
vendor commond PR containers/common#198 to set env
related issue containers/common#31
Signed-off-by: Qi Wang [email protected]