Add container information to .containerenv #2821
Conversation
rhatdan
force-pushed
the
containerenv
branch
from
7992dee to
6801b69
Compare
|
@containers/podman-maintainers PTAL |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhatdan, saschagrunert 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 |
|
LGTM |
run_linux.go
Outdated
| id=%q | ||
| image=%q | ||
| imageid=%q | ||
| `, Version, b.Container, b.ContainerID, b.FromImage, b.FromImageID) |
There was a problem hiding this comment.
| `, Version, b.Container, b.ContainerID, b.FromImage, b.FromImageID) | |
| `, Version, b.Container, b.ContainerID, b.FromImage, b.FromImageID, isRootless) |
| name=%q | ||
| id=%q | ||
| image=%q | ||
| imageid=%q |
There was a problem hiding this comment.
| imageid=%q | |
| imageid=%q | |
| rootless=%q |
| containerenvPath := filepath.Join(path, "/run/.containerenv") | ||
| if err = os.MkdirAll(filepath.Dir(containerenvPath), 0755); err != nil { | ||
| return err | ||
| } | ||
| emptyFile, err := os.Create(containerenvPath) | ||
| if err != nil { | ||
|
|
There was a problem hiding this comment.
| isRootless := fmt.Sprintf("%v", unshare.IsRootless()) |
|
I'd add the rootless info too, we'll probably want it at some point and it was part of the discussion in the issue. |
We have been asked to leak some container information and image information into the container to be used by certain tools. (Toolbox and others) Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan
force-pushed
the
containerenv
branch
from
6801b69 to
d9a7f13
Compare
|
LGTM |
|
Thanks a lot, @rhatdan ! |
| rootless = 1 | ||
| } | ||
| // Populate the .containerenv with container information | ||
| containerenv := fmt.Sprintf(`\ |
There was a problem hiding this comment.
This looks weird. Why is the \ here?
There was a problem hiding this comment.
Makes the code easier to read, i figure.
There was a problem hiding this comment.
That backslash makes it into the file, though, which is what makes it look weird.
There was a problem hiding this comment.
Ok perhaps we should remove it then.
We have been asked to leak some container information
and image information into the container to be used
by certain tools. (Toolbox and others)
Signed-off-by: Daniel J Walsh [email protected]
What type of PR is this?
What this PR does / why we need it:
How to verify it
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?