diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-09 19:58:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 19:58:09 +0000 |
| commit | 8f33751b57f7a59b92f87dc8d88669bc13706097 (patch) | |
| tree | e27f659a23d9cc46c1a395cfef6f93f3091205f0 | |
| parent | abc77b42219aaccf5cf1a1c9f1202c1525c0d807 (diff) | |
| parent | 71fe8224343980b69108dd20e5245bb3086e44b1 (diff) | |
| download | podman-8f33751b57f7a59b92f87dc8d88669bc13706097.tar.gz podman-8f33751b57f7a59b92f87dc8d88669bc13706097.tar.bz2 podman-8f33751b57f7a59b92f87dc8d88669bc13706097.zip | |
Merge pull request #8283 from kierdavis/docs
[CI:DOCS] man pages: add an example, tweak formatting
| -rw-r--r-- | docs/source/markdown/podman-import.1.md | 3 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pull.1.md | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-import.1.md b/docs/source/markdown/podman-import.1.md index 946b680dd..b6d88aeac 100644 --- a/docs/source/markdown/podman-import.1.md +++ b/docs/source/markdown/podman-import.1.md @@ -22,6 +22,7 @@ Note: `:` is a restricted character and cannot be part of the file name. Apply the following possible instructions to the created image: **CMD** | **ENTRYPOINT** | **ENV** | **EXPOSE** | **LABEL** | **STOPSIGNAL** | **USER** | **VOLUME** | **WORKDIR** + Can be set multiple times **--message**, **-m**=*message* @@ -55,7 +56,7 @@ db65d991f3bbf7f31ed1064db9a6ced7652e3f8166c4736aa9133dadd3c7acb3 ``` ``` -$ podman import --change "ENTRYPOINT ["/bin/sh","-c","test-image"]" --change LABEL=blue=image test-image.tar image-imported +$ podman import --change 'ENTRYPOINT ["/bin/sh","-c","test-image"]' --change LABEL=blue=image test-image.tar image-imported Getting image source signatures Copying blob e3b0c44298fc skipped: already exists Copying config 1105523502 done diff --git a/docs/source/markdown/podman-pull.1.md b/docs/source/markdown/podman-pull.1.md index 46beb4c42..9e3911704 100644 --- a/docs/source/markdown/podman-pull.1.md +++ b/docs/source/markdown/podman-pull.1.md @@ -120,6 +120,17 @@ Storing signatures ``` ``` +$ podman pull alpine@sha256:d7342993700f8cd7aba8496c2d0e57be0666e80b4c441925fc6f9361fa81d10e +Trying to pull docker.io/library/alpine@sha256:d7342993700f8cd7aba8496c2d0e57be0666e80b4c441925fc6f9361fa81d10e... +Getting image source signatures +Copying blob 188c0c94c7c5 done +Copying config d6e46aa247 done +Writing manifest to image destination +Storing signatures +d6e46aa2470df1d32034c6707c8041158b652f38d2a9ae3d7ad7e7532d22ebe0 +``` + +``` $ podman pull --authfile temp-auths/myauths.json docker://docker.io/umohnani/finaltest Trying to pull docker.io/umohnani/finaltest:latest...Getting image source signatures Copying blob sha256:6d987f6f42797d81a318c40d442369ba3dc124883a0964d40b0c8f4f7561d913 |