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

Allow users to specify TMPDIR in containers.conf #8725

Merged
merged 1 commit into from
Dec 15, 2020

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Dec 15, 2020

Currently we hard code TMPDIR environment variable to /var/tmp
if it is not set in the Environment. This causes TMPDIR environment
variable to be ignored if set in containers.conf.

This change now uses the host environment TMPDIR, followed by
containers.conf and then hard codes TMPDIR, if it was not set.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

Currently we hard code TMPDIR environment variable to /var/tmp
if it is not set in the Environment. This causes TMPDIR environment
variable to be ignored if set in containers.conf.

This change now uses the host environment TMPDIR, followed by
containers.conf and then hard codes TMPDIR, if it was not set.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@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 Dec 15, 2020
@rhatdan
Copy link
Member Author

rhatdan commented Dec 15, 2020

Truly fixes #5412

@rhatdan
Copy link
Member Author

rhatdan commented Dec 15, 2020

@containers/podman-maintainers PTAL

@mheon
Copy link
Member

mheon commented Dec 15, 2020

LGTM

Copy link
Contributor

@QiWang19 QiWang19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2020
@openshift-merge-robot openshift-merge-robot merged commit 9379ee9 into containers:master Dec 15, 2020
@edsantiago
Copy link
Member

I meant to ask earlier if there was any way to test this. I assume that this change updates the precedence, but I couldn't find a way to confirm. How is $TMPDIR visible to a podman command-line user?

@edsantiago
Copy link
Member

Self-followup: found a way using unshare:

$ cat ~/.config/containers/containers.conf
[engine]
env = ["TMPDIR=/this/is/set/in/containers.conf"]
$ env -u TMPDIR ./bin/podman unshare /usr/bin/env|grep TMPD
TMPDIR=/this/is/set/in/containers.conf      <--- Good. Pre-8725, this prints /var/tmp
$ TMPDIR=/this/is/set/in/user/environment ./bin/podman unshare /usr/bin/env|grep TMPD
TMPDIR=/this/is/set/in/user/environment     <--- Good. Same thing pre-8725

Day late and dollar short, but /lgtm :-)

I do not plan to write a system test for this: I try hard to avoid mucking with .conf files in system tests due to the risk of not cleaning up properly and causing cascading failures. If anyone objects, and believes we need a regression test for this, please let me know.

@rhatdan
Copy link
Member Author

rhatdan commented Dec 15, 2020

Sorry I could not figure a good way of testing this out. So I instrumented the tool to see what TMPDIR was set to and then tried every scenario I could try.

@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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 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.

7 participants