opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1773 from TomSweeneyRedHat/dev/tsweeney/logoptfix1

Browse Source 
Touch up --log* options and daemons in man pages
This commit is contained in:
OpenShift Merge Robot
2018-11-07 17:25:04 -08:00
committed by GitHub
parent 1ebead256c 185ec6de43
commit 672f572f50
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/podman-build.1.md
View File

@ -171,7 +171,7 @@ value can be entered. The password is entered without echo.
**--disable-content-trust** **--disable-content-trust**
This is a Docker specific option to disable image verification to a Docker This is a Docker specific option to disable image verification to a Docker
registry and is not supported by Buildah. This flag is a NOOP and provided registry and is not supported by Podman. This flag is a NOOP and provided
soley for scripting compatibility. soley for scripting compatibility.
**--file, -f** *Dockerfile* **--file, -f** *Dockerfile*

12
docs/podman-create.1.md
View File

@ -66,7 +66,7 @@ Write the container ID to the file
**--conmon-pidfile**="" **--conmon-pidfile**=""
Write the pid of the `conmon` process to a file. `conmon` daemonizes separate from Podman, so this is necessary when using systemd to restart Podman containers. Write the pid of the `conmon` process to a file. `conmon` runs in a separate process than Podman, so this is necessary when using systemd to restart Podman containers.
**--cpu-count**=*0* **--cpu-count**=*0*
@ -321,13 +321,13 @@ Not implemented
**--log-driver**="*json-file*" **--log-driver**="*json-file*"
Logging driver for the container. Default is defined by daemon `--log-driver` flag. Logging driver for the container. Currently not supported. This flag is a NOOP provided soley for scripting compatibility.
**Warning**: the `podman logs` command works only for the `json-file` and
`journald` logging drivers.
**--log-opt**=[] **--log-opt**=[]
Logging driver specific options. Logging driver specific options. Used to set the path to the container log file. For example:
`--log-opt path=/var/log/container/mycontainer.json`
**--mac-address**="" **--mac-address**=""
@ -414,7 +414,7 @@ UUID short identifier (“f78375b1c487”)
Name (“jonah”) Name (“jonah”)
podman generates a UUID for each container, and if a name is not assigned podman generates a UUID for each container, and if a name is not assigned
to the container with **--name** then the daemon will also generate a random to the container with **--name** then it will generate a random
string name. The name is useful any place you need to identify a container. string name. The name is useful any place you need to identify a container.
This works for both background and foreground containers. This works for both background and foreground containers.

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

@ -78,7 +78,7 @@ Write the container ID to the file
**--conmon-pidfile**="" **--conmon-pidfile**=""
Write the pid of the `conmon` process to a file. `conmon` daemonizes separate from Podman, so this is necessary when using systemd to restart Podman containers. Write the pid of the `conmon` process to a file. `conmon` runs in a separate process than Podman, so this is necessary when using systemd to restart Podman containers.
**--cpu-period**=*0* **--cpu-period**=*0*
@ -333,16 +333,13 @@ Not implemented
**--log-driver**="*json-file*" **--log-driver**="*json-file*"
Logging driver for the container. Default is defined by daemon `--log-driver` flag. Logging driver for the container. Currently not supported. This flag is a NOOP provided soley for scripting compatibility.
**Warning**: the `podman logs` command works only for the `json-file` and
`journald` logging drivers.
**--log-opt**=[] **--log-opt**=[]
Logging driver specific options. Logging driver specific options. Used to set the path to the container log file. For example:
`path=/var/log/container/mycontainer.json`: Set the path to the container log file. `--log-opt path=/var/log/container/mycontainer.json`
**--mac-address**="" **--mac-address**=""
@ -399,7 +396,7 @@ The operator can identify a container in three ways:
- Name (“jonah”) - Name (“jonah”)
podman generates a UUID for each container, and if a name is not assigned podman generates a UUID for each container, and if a name is not assigned
to the container with **--name** then the daemon will also generate a random to the container with **--name** then it will generate a random
string name. The name is useful any place you need to identify a container. string name. The name is useful any place you need to identify a container.
This works for both background and foreground containers. This works for both background and foreground containers.