diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/podman-build.1.md | 5 | ||||
-rw-r--r-- | docs/podman-create.1.md | 9 | ||||
-rw-r--r-- | docs/podman-run.1.md | 9 | ||||
-rw-r--r-- | docs/podman-stats.1.md | 3 |
4 files changed, 16 insertions, 10 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md index c16d964a9..567d0ead3 100644 --- a/docs/podman-build.1.md +++ b/docs/podman-build.1.md @@ -405,6 +405,11 @@ If you omit the unit, the system uses bytes. If you omit the size entirely, the **--squash** +Squash all of the image's new layers into a single new layer; any preexisting layers +are not squashed. + +**--squash-all** + Squash all of the new image's layers (including those inherited from a base image) into a single new layer. **--tag**, **-t**=*imageName* diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 35602f97b..701f8b0fc 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -716,12 +716,11 @@ Run container in systemd mode. The default is *true*. The value *always* enforces the systemd mode is enforced without looking at the executable name. Otherwise, if set to true and the -command you are running inside the container is systemd or -/usr/sbin/init. +command you are running inside the container is systemd, /usr/sbin/init +or /sbin/init. -If the command you are running inside of the container is systemd or -/usr/sbin/init, Podman will setup tmpfs mount points in the following -directories: +If the command you are running inside of the container is systemd, +Podman will setup tmpfs mount points in the following directories: /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index b2baae07a..602aa69ed 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -753,12 +753,11 @@ Run container in systemd mode. The default is *true*. The value *always* enforces the systemd mode is enforced without looking at the executable name. Otherwise, if set to true and the -command you are running inside the container is systemd or -/usr/sbin/init. +command you are running inside the container is systemd, /usr/sbin/init +or /sbin/init. -If the command you are running inside of the container is systemd or -/usr/sbin/init, Podman will setup tmpfs mount points in the following -directories: +If the command you are running inside of the container is systemd +Podman will setup tmpfs mount points in the following directories: /run, /run/lock, /tmp, /sys/fs/cgroup/systemd, /var/lib/journal diff --git a/docs/podman-stats.1.md b/docs/podman-stats.1.md index e0cff0dc2..741873c3f 100644 --- a/docs/podman-stats.1.md +++ b/docs/podman-stats.1.md @@ -15,6 +15,9 @@ Note: Podman stats will not work in rootless environments that use CGroups V1. Podman stats relies on CGroup information for statistics, and CGroup v1 is not supported for rootless use cases. +Note: Rootless environments that use CGroups V2 are not able to report statistics +about their networking usage. + ## OPTIONS **--all**, **-a** |