-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
User specified environment after other environments are set #6028
Conversation
Fixes: #6017 |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 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 |
@mheon This works correctly in master. $ export http_proxy=http://2.2.2.2:2222; ./bin/podman run -e http_proxy=http://1.1.1.1:1111 alpine printenv http_proxy |
config.Env = env.Join(defaultEnv, config.Env) | ||
for name, val := range config.Env { | ||
g.AddProcessEnv(name, val) | ||
} |
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.
It might be good to add an inline comment here to explain why it's here to make sure it doesn't get moved up again inadvertently.
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.
This is a back port. And in code that is not used in the new version. I added a test for this situation in the master branch pull. I think we need more tests to make sure that environment handling is correct.
LGTM, but we're gonna miss 1.9.1 |
2f2d053
to
be44305
Compare
@mheon Yup we will leave it in the hopper for podman 1.9.2 |
Users can not currently override the environment variables set by --http-proxy Signed-off-by: Daniel J Walsh <[email protected]>
LGTM |
/lgtm |
Users can not currently override the environment variables set by
--http-proxy
Signed-off-by: Daniel J Walsh [email protected]