summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-01-07 05:37:24 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-01-07 05:37:24 -0500
commitd9ebbbfe5b6a22e61091fe764ae2875aa0bf8064 (patch)
tree525e61c3bef7d9c3c3d93e2532edab937ac7e593 /docs/source
parent68c9e02df72cbdfb2d239fb1de020bc1e0dabad3 (diff)
downloadpodman-d9ebbbfe5b6a22e61091fe764ae2875aa0bf8064.tar.gz
podman-d9ebbbfe5b6a22e61091fe764ae2875aa0bf8064.tar.bz2
podman-d9ebbbfe5b6a22e61091fe764ae2875aa0bf8064.zip
Switch references of /var/run -> /run
Systemd is now complaining or mentioning /var/run as a legacy directory. It has been many years where /var/run is a symlink to /run on all most distributions, make the change to the default. Partial fix for https://github.com/containers/podman/issues/8369 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/markdown/podman-build.1.md11
-rw-r--r--docs/source/markdown/podman.1.md2
2 files changed, 12 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index 67513e386..5de3124bb 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -305,6 +305,11 @@ Recognized formats include *oci* (OCI image-spec v1.0, the default) and
Note: You can also override the default format by setting the BUILDAH\_FORMAT
environment variable. `export BUILDAH_FORMAT=docker`
+#### **--from**
+
+Overrides the first `FROM` instruction within the Containerfile. If there are multiple
+FROM instructions in a Containerfile, only the first is changed.
+
**-h**, **--help**
Print usage statement
@@ -524,6 +529,12 @@ layers are not squashed.
Squash all of the new image's layers (including those inherited from a base
image) into a single new layer.
+#### **--stdin**
+
+Pass stdin into the RUN containers. Sometime commands being RUN within a Containerfile
+want to request information from the user. For example apt asking for a confirmation for install.
+Use --stdin to be able to interact from the terminal during the build.
+
#### **--tag**, **-t**=*imageName*
Specifies the name which will be assigned to the resulting image if the build
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 2688c1720..42054d075 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -122,7 +122,7 @@ Default root dir configured in `/etc/containers/storage.conf`.
#### **--runroot**=*value*
-Storage state directory where all state information is stored (default: "/var/run/containers/storage" for UID 0, "/var/run/user/$UID/run" for other users).
+Storage state directory where all state information is stored (default: "/run/containers/storage" for UID 0, "/run/user/$UID/run" for other users).
Default state dir configured in `/etc/containers/storage.conf`.
#### **--runtime**=*value*