diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-03-23 09:28:45 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-23 15:22:01 +0000 |
| commit | 5fc5b4eacb924a597611fe44dcb8e79a7f0b59ac (patch) | |
| tree | 526b52743c29e0766c87127a7e401e5ecd0bd986 /libpod/container_internal.go | |
| parent | 75f9fdf21ca7d2002c226222e6f839e28c4361dd (diff) | |
| download | podman-5fc5b4eacb924a597611fe44dcb8e79a7f0b59ac.tar.gz podman-5fc5b4eacb924a597611fe44dcb8e79a7f0b59ac.tar.bz2 podman-5fc5b4eacb924a597611fe44dcb8e79a7f0b59ac.zip | |
Document .containerenv in manpages. Move it to /run.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #533
Approved by: baude
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index d70e5c13b..0b04cc81a 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -673,13 +673,14 @@ func (c *Container) makeBindMounts() error { } // Make .containerenv - if _, ok := c.state.BindMounts["/.containerenv"]; !ok { + // Empty file, so no need to recreate if it exists + if _, ok := c.state.BindMounts["/run/.containerenv"]; !ok { // Empty string for now, but we may consider populating this later containerenvPath, err := c.writeStringToRundir(".containerenv", "") if err != nil { return errors.Wrapf(err, "error creating containerenv file for container %s", c.ID()) } - c.state.BindMounts["/.containerenv"] = containerenvPath + c.state.BindMounts["/run/.containerenv"] = containerenvPath } return nil |