summaryrefslogtreecommitdiff
path: root/docs/source/markdown
diff options
context:
space:
mode:
Diffstat (limited to 'docs/source/markdown')
-rw-r--r--docs/source/markdown/podman-machine-list.1.md42
-rw-r--r--docs/source/markdown/podman-rm.1.md9
-rw-r--r--docs/source/markdown/podman.1.md5
3 files changed, 50 insertions, 6 deletions
diff --git a/docs/source/markdown/podman-machine-list.1.md b/docs/source/markdown/podman-machine-list.1.md
index accdd760c..d68b8b1ca 100644
--- a/docs/source/markdown/podman-machine-list.1.md
+++ b/docs/source/markdown/podman-machine-list.1.md
@@ -20,16 +20,26 @@ tied to the Linux kernel.
#### **--format**=*format*
-Format list output using a Go template.
-
+Change the default output format. This can be of a supported type like 'json'
+or a Go template.
Valid placeholders for the Go template are listed below:
| **Placeholder** | **Description** |
| --------------- | ------------------------------- |
-| .Name | VM name |
+| .CPUs | Number of CPUs |
| .Created | Time since VM creation |
+| .Default | Is default machine |
+| .DiskSize | Disk size of machine |
+| .LastUp | Time machine was last up |
| .LastUp | Time since the VM was last run |
-| .VMType | VM type |
+| .Memory | Allocated memeory for machine |
+| .Name | VM name |
+| .Running | Is machine running |
+| .Stream | Stream name |
+| .VMType | VM type |
+| .Port | SSH Port to use to connect to VM|
+| .RemoteUsername | VM Username for rootless Podman |
+| .IdentityPath | Path to ssh identify file |
#### **--help**
@@ -43,8 +53,28 @@ Omit the table headings from the listing of pods.
```
$ podman machine list
-
-$ podman machine ls --format {{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}\n
+NAME VM TYPE CREATED LAST UP CPUS MEMORY DISK SIZE
+podman-machine-default qemu 2 weeks ago 2 weeks ago 1 2.147GB 10.74GB
+
+$ podman machine ls --format "table {{.Name}}\t{{.VMType}}\t{{.Created}}\t{{.LastUp}}"
+NAME VM TYPE CREATED LAST UP
+podman-machine-default qemu 2 weeks ago 2 weeks ago
+
+$ podman machine ls --format json
+[
+ {
+ "Name": "podman-machine-default",
+ "Default": false,
+ "Created": "2021-12-27T10:36:14.373347492-05:00",
+ "Running": false,
+ "LastUp": "2021-12-27T11:22:50.17333371-05:00",
+ "Stream": "default",
+ "VMType": "qemu",
+ "CPUs": 1,
+ "Memory": "2147483648",
+ "DiskSize": "10737418240"
+ }
+]
```
## SEE ALSO
diff --git a/docs/source/markdown/podman-rm.1.md b/docs/source/markdown/podman-rm.1.md
index c599c8687..f3807d2f7 100644
--- a/docs/source/markdown/podman-rm.1.md
+++ b/docs/source/markdown/podman-rm.1.md
@@ -18,6 +18,10 @@ Running or unusable containers will not be removed without the **-f** option.
Remove all containers. Can be used in conjunction with **-f** as well.
+#### **--depend**
+
+Remove selected container and recursively remove all containers that depend on it.
+
#### **--cidfile**
Read container ID from the specified file and remove the container. Can be specified multiple times.
@@ -56,6 +60,11 @@ Remove a container by its name *mywebserver*
$ podman rm mywebserver
```
+Remove a *mywebserver* container and all of the containers that depend on it
+```
+$ podman rm --depend mywebserver
+```
+
Remove several containers by name and container id.
```
$ podman rm mywebserver myflaskserver 860a4b23
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index daa8212c5..9f85ebda3 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -92,6 +92,11 @@ When namespace is set, created containers and pods will join the given namespace
#### **--network-cmd-path**=*path*
Path to the command binary to use for setting up a network. It is currently only used for setting up a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable.
+#### **--noout**
+
+Redirect stdout to /dev/null. This command will prevent all stdout from the Podman command. The **--noout** option will not block stderr or stdout from containers.
+
+
#### **--remote**, **-r**
When true, access to the Podman service will be remote. Defaults to false.
Settings can be modified in the containers.conf file. If the CONTAINER_HOST