Skip to content

Commit

Permalink
Merge pull request #15422 from edsantiago/docs_dedup_podidfile
Browse files Browse the repository at this point in the history
Man pages: refactor common options: --pod-id-file
  • Loading branch information
openshift-merge-robot authored Aug 23, 2022
2 parents d97f4df + 74388fe commit 498fe67
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
3 changes: 3 additions & 0 deletions docs/source/markdown/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ podman-manifest-push.1.md
podman-pause.1.md
podman-pod-clone.1.md
podman-pod-create.1.md
podman-pod-rm.1.md
podman-pod-start.1.md
podman-pod-stop.1.md
podman-pull.1.md
podman-push.1.md
podman-rm.1.md
Expand Down
4 changes: 4 additions & 0 deletions docs/source/markdown/options/pod-id-file.container.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#### **--pod-id-file**=*file*

Run container in an existing pod and read the pod's ID from the specified *file*.
If a container is run within a pod, and the pod has an infra-container, the infra-container will be started before the container is.
3 changes: 3 additions & 0 deletions docs/source/markdown/options/pod-id-file.pod.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#### **--pod-id-file**=*file*

Read pod ID from the specified *file* and <<subcommand>> the pod. Can be specified multiple times.
4 changes: 1 addition & 3 deletions docs/source/markdown/podman-create.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,7 @@ Default is to create a private PID namespace for the container
Run container in an existing pod. If you want Podman to make the pod for you, preference the pod name with `new:`.
To make a pod with more granular options, use the `podman pod create` command before creating a container.

#### **--pod-id-file**=*path*

Run container in an existing pod and read the pod's ID from the specified file. If a container is run within a pod, and the pod has an infra-container, the infra-container will be started before the container is.
@@option pod-id-file.container

#### **--privileged**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ ExecStop directive of a systemd service referencing that pod.

Instead of providing the pod name or ID, remove the last created pod. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

#### **--pod-id-file**

Read pod ID from the specified file and remove the pod. Can be specified multiple times.
@@option pod-id-file.pod

#### **--time**, **-t**=*seconds*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ Starts all pods

Instead of providing the pod name or ID, start the last created pod. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

#### **--pod-id-file**

Read pod ID from the specified file and start the pod. Can be specified multiple times.
@@option pod-id-file.pod

## EXAMPLE

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ ExecStop directive of a systemd service referencing that pod.

Instead of providing the pod name or ID, stop the last created pod. (This option is not available with the remote Podman client, including Mac and Windows (excluding WSL2) machines)

#### **--pod-id-file**

Read pod ID from the specified file and stop the pod. Can be specified multiple times.
@@option pod-id-file.pod

#### **--time**, **-t**=*seconds*

Expand Down
5 changes: 1 addition & 4 deletions docs/source/markdown/podman-run.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,7 @@ Run container in an existing pod. If you want Podman to make the pod for you, pr
To make a pod with more granular options, use the **podman pod create** command before creating a container.
If a container is run with a pod, and the pod has an infra-container, the infra-container will be started before the container is.

#### **--pod-id-file**=*path*

Run container in an existing pod and read the pod's ID from the specified file.
If a container is run within a pod, and the pod has an infra-container, the infra-container will be started before the container is.
@@option pod-id-file.container

#### **--preserve-fds**=*N*

Expand Down

0 comments on commit 498fe67

Please sign in to comment.