opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-12 08:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Document .containerenv in manpages. Move it to /run.

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #533
Approved by: baude
This commit is contained in:
Matthew Heon
2018-03-23 09:28:45 -04:00
committed by Atomic Bot
parent 75f9fdf21c
commit 5fc5b4eacb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/podman-run.1.md
View File

@ -21,6 +21,14 @@ If the IMAGE is not already loaded then **podman run** will pull the IMAGE, and
all image dependencies, from the repository in the same way running **podman
pull** IMAGE, before it starts the container from that image.
Several files will be automatically created within the container when it is run.
These include `/etc/hosts`, `/etc/hostname`, and `/etc/resolv.conf` to manage
networking. These will be based on the host's version of the files, though they
can be customized with options (for example, **--dns** will override the host's
DNS servers in the created `resolv.conf`). Additionally, an empty file is
created in each container to indicate to programs they are running in a
container. This file is located at `/run/.containerenv`.
## OPTIONS
**--add-host**=[]
Add a custom host-to-IP mapping (host:ip)

5
libpod/container_internal.go
View File

@ -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