diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-11 00:35:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 00:35:35 +0000 |
| commit | edb3f70bccd2eae14ddd95c74db35731b508f407 (patch) | |
| tree | 51e82489a9398d2378011cda7889137c912cdaad /docs | |
| parent | b53eccfc2adea661e4e4b48b59d4e3f8d3d4883a (diff) | |
| parent | eba1f77497efb48d810d3c2d2fa6cccecea695cb (diff) | |
| download | podman-edb3f70bccd2eae14ddd95c74db35731b508f407.tar.gz podman-edb3f70bccd2eae14ddd95c74db35731b508f407.tar.bz2 podman-edb3f70bccd2eae14ddd95c74db35731b508f407.zip | |
Merge pull request #15279 from mheon/bump_420_final
Final Backports and Bump to v4.2.0
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman-info.1.md | 4 | ||||
| -rw-r--r-- | docs/source/markdown/podman-volume-import.1.md | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index a5011f4aa..bfdfee1ed 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -729,6 +729,8 @@ specified and therefore not changed, allowing the image's sha256 hash to remain same. All files committed to the layers of the image will be created with the timestamp. +If the only instruction in a Containerfile is `FROM`, this flag has no effect. + #### **--tls-verify** Require HTTPS and verify certificates when talking to container registries diff --git a/docs/source/markdown/podman-info.1.md b/docs/source/markdown/podman-info.1.md index 347d8d27b..fc7e1f0e2 100644 --- a/docs/source/markdown/podman-info.1.md +++ b/docs/source/markdown/podman-info.1.md @@ -15,10 +15,6 @@ Displays information pertinent to the host, current storage stats, configured co ## OPTIONS -#### **--debug**, **-D** - -Show additional information - #### **--format**, **-f**=*format* Change output format to "json" or a Go template. diff --git a/docs/source/markdown/podman-volume-import.1.md b/docs/source/markdown/podman-volume-import.1.md index 4ae9ae1e2..ec5d5ebfc 100644 --- a/docs/source/markdown/podman-volume-import.1.md +++ b/docs/source/markdown/podman-volume-import.1.md @@ -9,6 +9,7 @@ podman\-volume\-import - Import tarball contents into an existing podman volume ## DESCRIPTION **podman volume import** imports the contents of a tarball into the podman volume's mount point. +The contents of the volume will be merged with the content of the tarball with the latter taking precedence. **podman volume import** can consume piped input when using `-` as source path. The given volume must already exist and will not be created by podman volume import. |