diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-07 15:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 15:06:17 -0500 |
| commit | 6c132b78f1338c01f60f0fd509710813e2832550 (patch) | |
| tree | 029911e38ed5dce8ae9fc33651425e1adff485a9 /docs/source | |
| parent | 3cf41c4a7349d2f2529ce94801de2de9898ae27f (diff) | |
| parent | d9ebbbfe5b6a22e61091fe764ae2875aa0bf8064 (diff) | |
| download | podman-6c132b78f1338c01f60f0fd509710813e2832550.tar.gz podman-6c132b78f1338c01f60f0fd509710813e2832550.tar.bz2 podman-6c132b78f1338c01f60f0fd509710813e2832550.zip | |
Merge pull request #8771 from rhatdan/run
Switch references of /var/run -> /run
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 11 | ||||
| -rw-r--r-- | docs/source/markdown/podman.1.md | 2 |
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* |