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

User specified environment after other environments are set #6028

Merged
merged 1 commit into from
May 1, 2020

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Apr 28, 2020

Users can not currently override the environment variables set by
--http-proxy

Signed-off-by: Daniel J Walsh [email protected]

@rhatdan
Copy link
Member Author

rhatdan commented Apr 28, 2020

Fixes: #6017

@openshift-ci-robot
Copy link
Collaborator

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2020
@rhatdan
Copy link
Member Author

rhatdan commented Apr 28, 2020

@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
http://1.1.1.1:1111

config.Env = env.Join(defaultEnv, config.Env)
for name, val := range config.Env {
g.AddProcessEnv(name, val)
}
Copy link
Member

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.

Copy link
Member Author

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.

@mheon
Copy link
Member

mheon commented Apr 28, 2020

LGTM, but we're gonna miss 1.9.1

@rhatdan
Copy link
Member Author

rhatdan commented Apr 29, 2020

@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]>
@TomSweeneyRedHat
Copy link
Member

LGTM

@mheon
Copy link
Member

mheon commented May 1, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 1, 2020
@openshift-merge-robot openshift-merge-robot merged commit e9b1785 into containers:v1.9 May 1, 2020
@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 Sep 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 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. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants