Merge branch 'containers:main' into main

This commit is contained in:
ryanhockstad
2023-09-13 14:23:16 -04:00
committed by GitHub
170 changed files with 17279 additions and 3754 deletions

View File

@ -33,7 +33,7 @@ Note: **N/A** means that the option cannot be supported in a single-node Podman
| topologySpreadConstraints\.labelSelector | N/A |
| topologySpreadConstraints\.minDomains | N/A |
| restartPolicy | ✅ |
| terminationGracePeriod | no |
| terminationGracePeriodSeconds | |
| activeDeadlineSeconds | no |
| readinessGates\.conditionType | no |
| hostname | ✅ |
@ -173,3 +173,15 @@ Note: **N/A** means that the option cannot be supported in a single-node Podman
| revisionHistoryLimit | no |
| progressDeadlineSeconds | no |
| paused | no |
## DaemonSet Fields
| Field | Support |
|-----------------------------------------|-------------------------------------------------------|
| selector | ✅ |
| template | ✅ |
| minReadySeconds | no |
| strategy\.type | no |
| strategy\.rollingUpdate\.maxSurge | no |
| strategy\.rollingUpdate\.maxUnavailable | no |
| revisionHistoryLimit | no |

View File

@ -7,6 +7,8 @@ Show the API documentation for version:
* `latest (main branch) <_static/api.html>`_
* `version 4.6 <_static/api.html?version=v4.6>`_
* `version 4.5 <_static/api.html?version=v4.5>`_
* `version 4.4 <_static/api.html?version=v4.4>`_

View File

@ -13,7 +13,7 @@ Initialize one or more containers.
You may use container IDs or names as input.
Initializing a container performs all tasks necessary for starting the container (mounting filesystems, creating an OCI spec, initializing the container network) but does not start the container.
If a container is not initialized, the `podman start` and `podman run` commands initialize it automatically prior to starting it.
This command is intended to be used for inspecting or modifying the container's filesystem or OCI spec prior to starting it.
This command is intended to be used for inspecting a container's filesystem or OCI spec prior to starting it.
This can be used to inspect the container before it runs, or debug why a container is failing to run.
## OPTIONS

View File

@ -30,6 +30,8 @@ Note that the generated Kubernetes YAML file can be used to re-run the deploymen
Note that if the pod being generated was created with the **--infra-name** flag set, then the generated kube yaml will have the **io.podman.annotations.infra.name** set where the value is the name of the infra container set by the user.
Also note that both Deployment and DaemonSet can only have `restartPolicy` set to `Always`.
## OPTIONS
#### **--filename**, **-f**=*filename*
@ -54,9 +56,9 @@ Note: this can only be set with the option `--type=deployment`.
Generate a Kubernetes service object in addition to the Pods. Used to generate a Service specification for the corresponding Pod output. In particular, if the object has portmap bindings, the service specification includes a NodePort declaration to expose the service. A random port is assigned by Podman in the specification.
#### **--type**, **-t**=*pod | deployment*
#### **--type**, **-t**=*pod* | *deployment* | *daemonset*
The Kubernetes kind to generate in the YAML file. Currently, the only supported Kubernetes specifications are `Pod` and `Deployment`. By default, the `Pod` specification is generated.
The Kubernetes kind to generate in the YAML file. Currently, the only supported Kubernetes specifications are `Pod`, `Deployment` and `DaemonSet`. By default, the `Pod` specification is generated.
## EXAMPLES

View File

@ -23,6 +23,7 @@ Currently, the supported Kubernetes kinds are:
- PersistentVolumeClaim
- ConfigMap
- Secret
- DaemonSet
`Kubernetes Pods or Deployments`

View File

@ -125,7 +125,7 @@ Valid options for `[Container]` are listed below:
|--------------------------------|------------------------------------------------------|
| AddCapability=CAP | --cap-add CAP |
| AddDevice=/dev/foo | --device /dev/foo |
| Annotation="YXZ" | --annotation "XYZ" |
| Annotation="XYZ" | --annotation "XYZ" |
| AutoUpdate=registry | --label "io.containers.autoupdate=registry" |
| ContainerName=name | --name name |
| DNS=192.168.55.1 | --dns=192.168.55.1 |
@ -144,16 +144,16 @@ Valid options for `[Container]` are listed below:
| HealthRetries=5 | --health-retries=5 |
| HealthStartPeriod=1m | --health-start-period=period=1m |
| HealthStartupCmd="command" | --health-startup-cmd="command" |
| HealthStartupInterval=1m | --health-startup-interval=2m |
| HealthStartupInterval=1m | --health-startup-interval=1m |
| HealthStartupRetries=8 | --health-startup-retries=8 |
| HealthStartupSuccess=2 | --health-startup-success=2 |
| HealthStartupTimeout=1m33s | --health-startup-timeout=1m33s |
| HealthTimeout=20s | --health-timeout=20s |
| HostName=new-host-name | --hostname="new-host-name" |
| Image=ubi8 | Image specification - ubi8 |
| IP=192.5.0.1 | --ip 192.5.0.0 |
| IP6=fd46:db93:aa76:ac37::10 | --ip6 2001:db8::1 |
| Label="YXZ" | --label "XYZ" |
| IP=192.5.0.1 | --ip 192.5.0.1 |
| IP6=2001:db8::1 | --ip6 2001:db8::1 |
| Label="XYZ" | --label "XYZ" |
| LogDriver=journald | --log-driver journald |
| Mount=type=... | --mount type=... |
| Network=host | --net host |
@ -733,7 +733,7 @@ Valid options for `[Network]` are listed below:
| IPAMDriver=dhcp | --ipam-driver dhcp |
| IPRange=192.168.55.128/25 | --ip-range 192.168.55.128/25 |
| IPv6=true | --ipv6 |
| Label="YXZ" | --label "XYZ" |
| Label="XYZ" | --label "XYZ" |
| NetworkName=foo | podman network create foo |
| Options=isolate | --opt isolate |
| PodmanArgs=--dns=192.168.55.1 | --dns=192.168.55.1 |

View File

@ -20,6 +20,8 @@ Systemd will automatically create the container when the user session is started
Administrators can use volumes to expose specific host data from the host system to the user, without the user being exposed to other parts of the system.
Timeout for podmansh can be set using the `podmansh_timeout` option in containers.conf.
## Setup
Create user login session using useradd while running as root.
@ -126,7 +128,7 @@ _EOF
```
## SEE ALSO
**[podman(1)](podman.1.md)**, **[podman-exec(1)](podman-exec.1.md)**, **quadlet(5)**
**[containers.conf(5)](containers.conf.5.md)**, **[podman(1)](podman.1.md)**, **[podman-exec(1)](podman-exec.1.md)**, **quadlet(5)**
## HISTORY
May 2023, Originally compiled by Dan Walsh <dwalsh@redhat.com>