20 changed files with 3481 additions and 942 deletions
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@ -1 +0,0 @@
-a72daf8585b41529269cdffcca3a0b3d4e2f21cd SOURCES/RPM-GPG-KEY-redhat-beta
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-SOURCES/RPM-GPG-KEY-redhat-beta
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
--- a/SOURCES/Containerfile.5.md
+++ b/SOURCES/Containerfile.5.md
@ -49,16 +49,16 @@ A Containerfile is similar to a Makefile.
  to a new image if necessary, before finally outputting the ID of the new
  image.

-  Container engines re-use intermediate images whenever possible. This significantly
+  Container engines reuse intermediate images whenever possible. This significantly
  accelerates the *build* process.

 # FORMAT

-  `FROM image`
+  `FROM image [AS <name>]`

-  `FROM image:tag`
+  `FROM image:tag [AS <name>]`

-  `FROM image@digest`
+  `FROM image@digest [AS <name>]`

  -- The **FROM** instruction sets the base image for subsequent instructions. A
  valid Containerfile must have either **ARG** or *FROM** as its first instruction.
@ -82,6 +82,9 @@ A Containerfile is similar to a Makefile.
  -- If no digest is given to the **FROM** instruction, container engines apply the
  `latest` tag. If the used tag does not exist, an error is returned.

+  -- A name can be assigned to a build stage by adding **AS name** to the instruction. 
+  The name can be referenced later in the Containerfile using the **FROM** or **COPY --from=<name>** instructions.
+
 **MAINTAINER**
  -- **MAINTAINER** sets the Author field for the generated images.
  Useful for providing users with an email or url for support.
@ -154,6 +157,47 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.

              · rw, read-write: allows writes on the mount.

+**RUN --network**
+
+`RUN --network` allows control over which networking environment the command
+is run in.
+
+Syntax: `--network=<TYPE>`
+
+**Network types**
+
+| Type                                         | Description                            |
+|----------------------------------------------|----------------------------------------|
+| [`default`](#run---networkdefault) (default) | Run in the default network.            |
+| [`none`](#run---networknone)                 | Run with no network access.            |
+| [`host`](#run---networkhost)                 | Run in the host's network environment. |
+
+##### RUN --network=default
+
+Equivalent to not supplying a flag at all, the command is run in the default
+network for the build.
+
+##### RUN --network=none
+
+The command is run with no network access (`lo` is still available, but is
+isolated to this process).
+
+##### Example: isolating external effects
+
+```dockerfile
+FROM python:3.6
+ADD mypackage.tgz wheels/
+RUN --network=none pip install --find-links wheels mypackage
+```
+
+`pip` will only be able to install the packages provided in the tarfile, which
+can be controlled by an earlier build stage.
+
+##### RUN --network=host
+
+The command is run in the host's network environment (similar to
+`buildah build --network=host`, but on a per-instruction basis)
+

 **RUN Secrets**

@ -321,10 +365,10 @@ The secret needs to be passed to the build using the --secret flag. The final im
  -- **COPY** has two forms:

  ```
-  COPY <src> <dest>
+  COPY [--chown=<user>:<group>] [--chmod=<mode>] <src> <dest>

  # Required for paths with whitespace
-  COPY ["<src>",... "<dest>"]
+  COPY [--chown=<user>:<group>] [--chmod=<mode>] ["<src>",... "<dest>"]
  ```

  The **COPY** instruction copies new files from `<src>` and
@ -337,6 +381,16 @@ The secret needs to be passed to the build using the --secret flag. The final im
  attempt to unpack it.  All new files and directories are created with mode **0755**
  and with the uid and gid of **0**.

+  `--chown=<user>:<group>` changes the ownership of new files and directories.
+  Supports names, if defined in the containers `/etc/passwd` and `/etc/groups` files, or using
+  uid and gid integers. The build will fail if a user or group name can't be mapped in the container.
+  Numeric id's are set without looking them up in the container.
+
+  `--chmod=<mode>` changes the mode of new files and directories.
+
+  The optional flag `--from=name` can be used to copy files from a named previous build stage. It
+  changes the context of `<src>` from the build context to the named build stage.
+
 **ENTRYPOINT**
  -- **ENTRYPOINT** has two forms:

--- a/SOURCES/RPM-GPG-KEY-redhat-beta
+++ b/SOURCES/RPM-GPG-KEY-redhat-beta
@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT
+kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A
+BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo
+gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P
+xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D
+FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7
+Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i
+QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm
+G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt
+0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR
+fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB
+tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv
+bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT
+ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy
+6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ
+OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6
+0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc
+MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u
+QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE
+Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6
+DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0
+B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH
+V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT
+CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ==
+=21pb
+-----END PGP PUBLIC KEY BLOCK-----
--- a/SOURCES/RPM-GPG-KEY-redhat-release
+++ b/SOURCES/RPM-GPG-KEY-redhat-release
@ -1,9 +1,13 @@
-pub   4096R/FD431D51 2009-10-22
-      Key fingerprint = 567E 347A D004 4ADE 55BA  8A5F 199E 2F91 FD43 1D51
-uid                  Red Hat, Inc. (release key 2) <security@redhat.com>
+The following public key can be used to verify RPM packages built and
+signed by Red Hat, Inc.  This key is used for packages in Red Hat
+products shipped after November 2009, and for all updates to those
+products.
+
+Questions about this key should be sent to security@redhat.com.
+
+pub  4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) <security@redhat.com>

 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)

 mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
 0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
@ -31,4 +35,32 @@ OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
 dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
 =zbHE
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----

+mQINBGIpIp4BEAC/o5e1WzLIsS6/JOQCs4XYATYTcf6B6ALzcP05G0W3uRpUQSrL
+FRKNrU8ZCelm/B+XSh2ljJNeklp2WLxYENDOsftDXGoyLr2hEkI5OyK267IHhFNJ
+g+BN+T5Cjh4ZiiWij6o9F7x2ZpxISE9M4iI80rwSv1KOnGSw5j2zD2EwoMjTVyVE
+/t3s5XJxnDclB7ZqL+cgjv0mWUY/4+b/OoRTkhq7b8QILuZp75Y64pkrndgakm1T
+8mAGXV02mEzpNj9DyAJdUqa11PIhMJMxxHOGHJ8CcHZ2NJL2e7yJf4orTj+cMhP5
+LzJcVlaXnQYu8Zkqa0V6J1Qdj8ZXL72QsmyicRYXAtK9Jm5pvBHuYU2m6Ja7dBEB
+Vkhe7lTKhAjkZC5ErPmANNS9kPdtXCOpwN1lOnmD2m04hks3kpH9OTX7RkTFUSws
+eARAfRID6RLfi59B9lmAbekecnsMIFMx7qR7ZKyQb3GOuZwNYOaYFevuxusSwCHv
+4FtLDIhk+Fge+EbPdEva+VLJeMOb02gC4V/cX/oFoPkxM1A5LHjkuAM+aFLAiIRd
+Np/tAPWk1k6yc+FqkcDqOttbP4ciiXb9JPtmzTCbJD8lgH0rGp8ufyMXC9x7/dqX
+TjsiGzyvlMnrkKB4GL4DqRFl8LAR02A3846DD8CAcaxoXggL2bJCU2rgUQARAQAB
+tDVSZWQgSGF0LCBJbmMuIChhdXhpbGlhcnkga2V5IDMpIDxzZWN1cml0eUByZWRo
+YXQuY29tPokCUgQTAQgAPBYhBH5GJCWMQGU11W1vE1BU5KRaY0CzBQJiKSKeAhsD
+BQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgAAKCRBQVOSkWmNAsyBfEACuTN/X
+YR+QyzeRw0pXcTvMqzNE4DKKr97hSQEwZH1/v1PEPs5O3psuVUm2iam7bqYwG+ry
+EskAgMHi8AJmY0lioQD5/LTSLTrM8UyQnU3g17DHau1NHIFTGyaW4a7xviU4C2+k
+c6X0u1CPHI1U4Q8prpNcfLsldaNYlsVZtUtYSHKPAUcswXWliW7QYjZ5tMSbu8jR
+OMOc3mZuf0fcVFNu8+XSpN7qLhRNcPv+FCNmk/wkaQfH4Pv+jVsOgHqkV3aLqJeN
+kNUnpyEKYkNqo7mNfNVWOcl+Z1KKKwSkIi3vg8maC7rODsy6IX+Y96M93sqYDQom
+aaWue2gvw6thEoH4SaCrCL78mj2YFpeg1Oew4QwVcBnt68KOPfL9YyoOicNs4Vuu
+fb/vjU2ONPZAeepIKA8QxCETiryCcP43daqThvIgdbUIiWne3gae6eSj0EuUPoYe
+H5g2Lw0qdwbHIOxqp2kvN96Ii7s1DK3VyhMt/GSPCxRnDRJ8oQKJ2W/I1IT5VtiU
+zMjjq5JcYzRPzHDxfVzT9CLeU/0XQ+2OOUAiZKZ0dzSyyVn8xbpviT7iadvjlQX3
+CINaPB+d2Kxa6uFWh+ZYOLLAgZ9B8NKutUHpXN66YSfe79xFBSFWKkJ8cSIMk13/
+Ifs7ApKlKCCRDpwoDqx/sjIaj1cpOfLHYjnefg==
+=UZd/
+-----END PGP PUBLIC KEY BLOCK-----
--- a/SOURCES/containers-auth.json.5.md
+++ b/SOURCES/containers-auth.json.5.md
@ -5,30 +5,33 @@ containers-auth.json - syntax for the registry authentication file

 # DESCRIPTION

-A credentials file in JSON format used to authenticate against container image registries.
+A file in JSON format controlling authentication against container image registries.
 The primary (read/write) file is stored at `${XDG_RUNTIME_DIR}/containers/auth.json` on Linux;
 on Windows and macOS, at `$HOME/.config/containers/auth.json`.

 When searching for the credential for a registry, the following files will be read in sequence until the valid credential is found:
 first reading the primary (read/write) file, or the explicit override using an option of the calling application.
-If credentials are not present, search in `${XDG_CONFIG_HOME}/containers/auth.json` (usually `~/.config/containers/auth.json`), `$HOME/.docker/config.json`, `$HOME/.dockercfg`.
+If credentials are not present there,
+the search continues in `${XDG_CONFIG_HOME}/containers/auth.json` (usually `~/.config/containers/auth.json`), `$HOME/.docker/config.json`, `$HOME/.dockercfg`.

-Except the primary (read/write) file, other files are read-only, unless the user use an option of the calling application explicitly points at it as an override.
+Except for the primary (read/write) file, other files are read-only unless the user, using an option of the calling application, explicitly points at it as an override.


 ## FORMAT

-The auth.json file stores encrypted authentication information for the
-user to container image registries.  The file can have zero to many entries and
-is created by a `login` command from a container tool such as `podman login`,
-`buildah login` or `skopeo login`. Each entry either contains a single
-hostname (e.g. `docker.io`) or a namespace (e.g. `quay.io/user/image`) as a key
-and an auth token in the form of a base64 encoded string as value of `auth`. The
-token is built from the concatenation of the username, a colon, and the
-password. The registry name can additionally contain a repository name (an image
-name without tag or digest) and namespaces. The path (or namespace) is matched
-in its hierarchical order when checking for available authentications. For
-example, an image pull for `my-registry.local/namespace/user/image:latest` will
+The auth.json file stores, or references, credentials that allow the user to authenticate
+to container image registries.
+It is primarily managed by a `login` command from a container tool such as `podman login`,
+`buildah login`, or `skopeo login`.
+
+Each entry contains a single hostname (e.g., `docker.io`) or a namespace (e.g., `quay.io/user/image`) as a key,
+and credentials in the form of a base64-encoded string as value of `auth`. The
+base64-encoded string contains a concatenation of the username, a colon, and the
+password.
+
+When checking for available credentials, the relevant repository is matched
+against available keys in its hierarchical order, going from most-specific to least-specific.
+For example, an image pull for `my-registry.local/namespace/user/image:latest` will
 result in a lookup in `auth.json` in the following order:

 - `my-registry.local/namespace/user/image`
@ -77,10 +80,8 @@ preserving a fallback for `my-registry.local`:
 An entry can be removed by using a `logout` command from a container
 tool such as `podman logout` or `buildah logout`.

-In addition, credential helpers can be configured for specific registries and the credentials-helper
-software can be used to manage the credentials in a more secure way than depending on the base64 encoded authentication
-provided by `login`.  If the credential helpers are configured for specific registries, the base64 encoded authentication will not be used
-for operations concerning credentials of the specified registries.
+In addition, credential helpers can be configured for specific registries, and the credentials-helper
+software can be used to manage the credentials more securely than storing only base64-encoded credentials in `auth.json`.

 When the credential helper is in use on a Linux platform, the auth.json file would contain keys that specify the registry domain, and values that specify the suffix of the program to use (i.e. everything after docker-credential-).  For example:

--- a/SOURCES/containers-policy.json.5.md
+++ b/SOURCES/containers-policy.json.5.md
@ -30,7 +30,9 @@ Policy requirements can be defined for:

  Usually, a scope can be defined to match a single image, and various prefixes of
  such a most specific scope define namespaces of matching images.
+
 - A default policy for a single transport, expressed using an empty string as a scope
+
 - A global default policy.

 If multiple policy requirements match a given image, only the requirements from the most specific match apply,
@ -59,18 +61,41 @@ The global `default` set of policy requirements is mandatory; all of the other f
 <!-- NOTE: Keep this in sync with transports/transports.go! -->
 ## Supported transports and their scopes

+See containers-transports(5) for general documentation about the transports and their reference syntax.
+
 ### `atomic:`

-The `atomic:` transport refers to images in an Atomic Registry.
+The deprecated `atomic:` transport refers to images in an Atomic Registry.

 Supported scopes use the form _hostname_[`:`_port_][`/`_namespace_[`/`_imagestream_ [`:`_tag_]]],
 i.e. either specifying a complete name of a tagged image, or prefix denoting
-a host/namespace/image stream or a wildcarded expression for matching all
+a host/namespace/image stream, or a wildcarded expression starting with `*.` for matching all
 subdomains. For wildcarded subdomain matching, `*.example.com` is a valid case, but `example*.*.com` is not.

 *Note:* The _hostname_ and _port_ refer to the container registry host and port (the one used
 e.g. for `docker pull`), _not_ to the OpenShift API host and port.

+### `containers-storage:`
+
+Supported scopes have the form `[`_storage-specifier_`]`_image-scope_.
+
+`[`_storage-specifier_`]` is usually `[`_graph-driver-name_`@`_graph-root_`]`, e.g. `[overlay@/var/lib/containers/storage]`.
+
+_image-scope_ matching the individual image is
+- a named Docker reference *in the fully expanded form*, either using a tag or digest. For example, `docker.io/library/busybox:latest` (*not* `busybox:latest`)
+- and/or (depending on which one the user’s input provides) `@`_image-id_
+
+More general scopes are prefixes of individual-image scopes, and specify a less-precisely-specified image, or a repository
+(by omitting first the image ID, if any; then the digest, if any; and finally a tag, if any),
+a repository namespace, or a registry host (by only specifying the host name and possibly a port number).
+
+Finally, two full-store specifiers matching all images in the store are valid scopes:
+- `[`_graph-driver-name_`@`_graph-root_`]` and
+- `[`_graph-root_`]`
+
+Note that some tools like Podman and Buildah hard-code overrides of the signature verification policy for “push” operations,
+allowing these operations regardless of configuration in `policy.json`.
+
 ### `dir:`

 The `dir:` transport refers to images stored in local directories.
@ -78,10 +103,10 @@ The `dir:` transport refers to images stored in local directories.
 Supported scopes are paths of directories (either containing a single image or
 subdirectories possibly containing images).

-*Note:* The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
-
-The top-level scope `"/"` is forbidden; use the transport default scope `""`,
-for consistency with other transports.
+*Note:*
+- The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
+- The top-level scope `"/"` is forbidden; use the transport default scope `""`,
+  for consistency with other transports.

 ### `docker:`

@ -91,24 +116,73 @@ Scopes matching individual images are named Docker references *in the fully expa
 using a tag or digest. For example, `docker.io/library/busybox:latest` (*not* `busybox:latest`).

 More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest),
-a repository namespace, or a registry host (by only specifying the host name)
-or a wildcarded expression for matching all subdomains. For wildcarded subdomain
+a repository namespace, or a registry host (by only specifying the host name and possibly a port number)
+or a wildcarded expression starting with `*.`, for matching all subdomains (not including a port number). For wildcarded subdomain
+matching, `*.example.com` is a valid case, but `example*.*.com` is not.
+
+### `docker-archive:`
+
+Only the default `""` scope is supported.
+
+### `docker-daemon:`
+
+For references using the _algo:digest_ format (referring to an image ID), only the default `""` scope is used.
+
+For images using a named reference, scopes matching individual images are *in the fully expanded form*, either
+using a tag or digest. For example, `docker.io/library/busybox:latest` (*not* `busybox:latest`).
+
+More general named scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest),
+a repository namespace, or a registry host (by only specifying the host name and possibly a port number)
+or a wildcarded expression starting with `*.`, for matching all subdomains (not including a port number). For wildcarded subdomain
 matching, `*.example.com` is a valid case, but `example*.*.com` is not.

 ### `oci:`

 The `oci:` transport refers to images in directories compliant with "Open Container Image Layout Specification".

-Supported scopes use the form _directory_`:`_tag_, and _directory_ referring to
-a directory containing one or more tags, or any of the parent directories.
+Supported scopes are paths to directories
+(either containing an OCI layout, or subdirectories possibly containing OCI layout directories).
+The _reference_ annotation value, if any, is not used.

-*Note:* See `dir:` above for semantics and restrictions on the directory paths, they apply to `oci:` equivalently.
+*Note:*
+- The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
+- The top-level scope `"/"` is forbidden; use the transport default scope `""`,
+  for consistency with other transports.
+
+### `oci-archive:`
+
+Supported scopes are paths to OCI archives, and their parent directories
+(either containing a single archive, or subdirectories possibly containing archives).
+The _reference_ annotation value, if any, is not used.
+
+*Note:*
+- The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
+- The top-level scope `"/"` is forbidden; use the transport default scope `""`,
+  for consistency with other transports.
+
+### `ostree`:
+
+Supported scopes have the form _repo-path_`:`_image-scope_; _repo_path_ is the path to the OSTree repository.
+
+_image-scope_ is the _docker_reference_ part of the reference, with with a `:latest` tag implied if no tag is present,
+and parent namespaces of the _docker_reference_ value (by omitting the tag, or a prefix specifying a higher-level namespace).
+
+*Note:*
+- The _repo_path_ must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
+
+### `sif:`
+
+Supported scopes are paths to Singularity images, and their parent directories
+(either containing images, or subdirectories possibly containing images).
+
+*Note:*
+- The paths must be absolute and contain no symlinks. Paths violating these requirements may be silently ignored.
+- The top-level scope `"/"` is forbidden; use the transport default scope `""`,
+  for consistency with other transports.

 ### `tarball:`

-The `tarball:` transport refers to tarred up container root filesystems.
-
-Scopes are ignored.
+The `tarball:` transport is an implementation detail of some import workflows. Only the default `""` scope is supported.

 ## Policy Requirements

@ -245,17 +319,42 @@ This requirement requires an image to be signed using a sigstore signature with
 ```js
 {
    "type":    "sigstoreSigned",
-    "keyPath": "/path/to/local/keyring/file",
-    "keyData": "base64-encoded-keyring-data",
+    "keyPath": "/path/to/local/public/key/file",
+    "keyData": "base64-encoded-public-key-data",
+    "fulcio": {
+        "caPath": "/path/to/local/CA/file",
+        "caData": "base64-encoded-CA-data",
+        "oidcIssuer": "https://expected.OIDC.issuer/",
+        "subjectEmail", "expected-signing-user@example.com",
+    },
+    "rekorPublicKeyPath": "/path/to/local/public/key/file",
+    "rekorPublicKeyData": "base64-encoded-public-key-data",
    "signedIdentity": identity_requirement
 }
 ```
-Exactly one of `keyPath` and `keyData` must be present, containing a sigstore public key.  Only signatures made by this key is accepted.
+Exactly one of `keyPath`, `keyData` and `fulcio` must be present.
+
+If `keyPath` or `keyData` is present, it contains a sigstore public key.
+Only signatures made by this key are accepted.
+
+If `fulcio` is present, the signature must be based on a Fulcio-issued certificate.
+One of `caPath` and `caData` must be specified, containing the public key of the Fulcio instance.
+Both `oidcIssuer` and `subjectEmail` are mandatory,
+exactly specifying the expected identity provider,
+and the identity of the user obtaining the Fulcio certificate.
+
+At most one of `rekorPublicKeyPath` and `rekorPublicKeyData` can be present;
+it is mandatory if `fulcio` is specified.
+If a Rekor public key is specified,
+the signature must have been uploaded to a Rekor server
+and the signature must contain an (offline-verifiable) “signed entry timestamp”
+proving the existence of the Rekor log record,
+signed by the provided public key.

 The `signedIdentity` field has the same semantics as in the `signedBy` requirement described above.
 Note that `cosign`-created signatures only contain a repository, so only `matchRepository` and `exactRepository` can be used to accept them (and that does not protect against substitution of a signed image with an unexpected tag).

-To use this with images hosted on image registries, the relevant registry or repository must have the `use-sigstore-attachments` option enabled in containers-registries.d(5).
+To use this with images hosted on image registries, the `use-sigstore-attachments` option needs to be enabled for the relevant registry or repository in the client's containers-registries.d(5).

 ## Examples

@ -286,6 +385,21 @@ selectively allow individual transports and scopes as desired.
                    "keyPath": "/path/to/sigstore-pubkey.pub"
                }
            ],
+            /* A sigstore-signed repository using the community Fulcio+Rekor servers.
+
+               The community servers’ public keys can be obtained from
+               https://github.com/sigstore/sigstore/tree/main/pkg/tuf/repository/targets .  */
+            "hostname:5000/myns/sigstore-signed-fulcio-rekor": [
+                {
+                    "type": "sigstoreSigned",
+                    "fulcio": {
+                        "caPath": "/path/to/fulcio_v1.crt.pem",
+                        "oidcIssuer": "https://github.com/login/oauth",
+                        "subjectEmail": "test-user@example.com"
+                    },
+                    "rekorPublicKeyPath": "/path/to/rekor.pub",
+                }
+            ],
            /* A sigstore-signed repository, accepts signatures by /usr/bin/cosign */
            "hostname:5000/myns/sigstore-signed-allows-malicious-tag-substitution": [
                {
@ -293,8 +407,25 @@ selectively allow individual transports and scopes as desired.
                    "keyPath": "/path/to/sigstore-pubkey.pub",
                    "signedIdentity": {"type": "matchRepository"}
                }
+            ],
+            /* A sigstore-signed repository using the community Fulcio+Rekor servers,
+               accepts signatures by /usr/bin/cosign.
+
+               The community servers’ public keys can be obtained from
+               https://github.com/sigstore/sigstore/tree/main/pkg/tuf/repository/targets .  */
+            "hostname:5000/myns/sigstore-signed-fulcio-rekor- allows-malicious-tag-substitution": [
+                {
+                    "type": "sigstoreSigned",
+                    "fulcio": {
+                        "caPath": "/path/to/fulcio_v1.crt.pem",
+                        "oidcIssuer": "https://github.com/login/oauth",
+                        "subjectEmail": "test-user@example.com"
+                    },
+                    "rekorPublicKeyPath": "/path/to/rekor.pub",
+                    "signedIdentity": { "type": "matchRepository" }
+                }
            ]
-            /* Other docker: images use the global default policy and are rejected */
+              /* Other docker: images use the global default policy and are rejected */
        },
        "dir": {
            "": [{"type": "insecureAcceptAnything"}] /* Allow any images originating in local directories */
--- a/SOURCES/containers-registries.conf.5.md
+++ b/SOURCES/containers-registries.conf.5.md
@ -73,16 +73,16 @@ internet without having to change `Dockerfile`s, or to add redundancy).
 : Accepts the same format as the `prefix` field, and specifies the physical location
 of the `prefix`-rooted namespace.

-By default, this equal to `prefix` (in which case `prefix` can be omitted and the
+By default, this is equal to `prefix` (in which case `prefix` can be omitted and the
 `[[registry]]` TOML table can only specify `location`).

 Example: Given
 ```
 prefix = "example.com/foo"
-location = "internal-registry-for-example.net/bar"
+location = "internal-registry-for-example.com/bar"
 ```
 requests for the image `example.com/foo/myimage:latest` will actually work with the
-`internal-registry-for-example.net/bar/myimage:latest` image.
+`internal-registry-for-example.com/bar/myimage:latest` image.

 With a `prefix` containing a wildcard in the format: "*.example.com" for subdomain matching,
 the location can be empty. In such a case,
@ -127,8 +127,9 @@ Referencing an image by digest ensures that the same is always used
 different images if the tag mapping is out of sync).


-*Note*: Redirection and mirrors are currently processed only when reading images, not when pushing
-to a registry; that may change in the future.
+*Note*: Redirection and mirrors are currently processed only when reading a single image,
+not when pushing to a registry nor when doing any other kind of lookup/search on a on a registry.
+This may change in the future.

 #### Short-Name Aliasing
 The use of unqualified-search registries entails an ambiguity as it is
@ -247,7 +248,7 @@ Given the above, a pull of `example.com/foo/image:latest` will try:

 1. `example-mirror-0.local/mirror-for-foo/image:latest`
 2. `example-mirror-1.local/mirrors/foo/image:latest`
-3. `internal-registry-for-example.net/bar/image:latest`
+3. `internal-registry-for-example.com/bar/image:latest`

 in order, and use the first one that exists.

--- a/SOURCES/containers-signature.5.md
+++ b/SOURCES/containers-signature.5.md
@ -68,7 +68,9 @@ the consumer MUST verify at least the following aspects of the signature
 (like the `github.com/containers/image/signature` package does):

 - The blob MUST be a “Signed Message” as defined RFC 4880 section 11.3.
-  (e.g. it MUST NOT be an unsigned “Literal Message”, or any other non-signature format).
+  (e.g. it MUST NOT be an unsigned “Literal Message”,
+  a “Cleartext Signature” as defined in RFC 4880 section 7,
+  or any other non-signature format).
 - The signature MUST have been made by an expected key trusted for the purpose (and the specific container image).
 - The signature MUST be correctly formed and pass the cryptographic validation.
 - The signature MUST correctly authenticate the included JSON payload
@ -210,7 +212,8 @@ Consumers still SHOULD reject any signature where a member of an `optional` obje

 ### `optional.creator`

-If present, this MUST be a JSON string, identifying the name and version of the software which has created the signature.
+If present, this MUST be a JSON string, identifying the name and version of the software which has created the signature
+(identifying the low-level software implementation; not the top-level caller).

 The contents of this string is not defined in detail; however each implementation creating container signatures:

--- a/SOURCES/containers-storage.conf.5.md
+++ b/SOURCES/containers-storage.conf.5.md
@ -55,10 +55,28 @@ $ restorecon -R -v /NEWSTORAGEPATH

 A common use case for this field is to provide a local storage directory when user home directories are NFS-mounted (podman does not support container storage over NFS).

+**imagestore**=""
+ The image storage path (the default is assumed to be the same as `graphroot`). Path of the imagestore, which is different from `graphroot`. By default, images in the storage library are stored in the `graphroot`. If `imagestore` is provided, newly pulled images will be stored in the `imagestore` location. All other storage continues to be stored in the `graphroot`. When using the `overlay` driver, images previously stored in the `graphroot` remain accessible. Internally, the storage library mounts `graphroot` as an `additionalImageStore` to allow this behavior.
+
+A common use case for the `imagestore` field is users who need to split filesystems in different partitions. The `imagestore` partition stores images and the `graphroot` partition stores container content created from the images.
+
+Imagestore, if set, must be different from `graphroot`.
+
 **runroot**=""
  container storage run dir (default: "/run/containers/storage")
 Default directory to store all temporary writable content created by container storage programs. The rootless runroot path supports environment variable substitutions (ie. `$HOME/containers/storage`)

+**driver_priority**=[]
+  Priority list for the storage drivers that will be tested one after the other to pick the storage driver if it is not defined. The first storage driver in this list that can be used, will be picked as the new one and all subsequent ones will not be tried. If all drivers in this list are not viable, then **all** known drivers will be tried and the first working one will be picked.
+By default, the storage driver is set via the `driver` option. If it is not defined, then the best driver will be picked according to the current platform. This option allows you to override this internal priority list with a custom one to prefer certain drivers.
+Setting this option only has an effect if the local storage has not been initialized yet and the driver name is not set.
+
+**transient_store** = "false" | "true"
+
+Transient store mode makes all container metadata be saved in temporary storage
+(i.e. runroot above). This is faster, but doesn't persist across reboots.
+Additional garbage collection must also be performed at boot-time, so this option should remain disabled in most configurations. (default: false)
+
 ### STORAGE OPTIONS TABLE

 The `storage.options` table supports the following options:
@ -77,7 +95,7 @@ container registry. These options can deduplicate pulling of content, disk
 storage of content and can allow the kernel to use less memory when running
 containers.

-containers/storage supports four keys
+containers/storage supports three keys
  * enable_partial_images="true" | "false"
    Tells containers/storage to look for files previously pulled in storage
    rather then always pulling them from the container registry.
@ -88,20 +106,24 @@ containers/storage supports four keys
    Tells containers/storage where an ostree repository exists that might have
    previously pulled content which can be used when attempting to avoid
    pulling content from the container registry
+  * convert_images = "false" | "true"
+    If set to true, containers/storage will convert images to the a format compatible with
+    partial pulls in order to take advantage of local deduplication and hardlinking.  It is an
+    expensive operation so it is not enabled by default.

 **remap-uids=**""
 **remap-gids=**""
  Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of a container, to the UIDs/GIDs outside of the container, and the length of the range of UIDs/GIDs.  Additional mapped sets can be listed and will be heeded by libraries, but there are limits to the number of mappings which the kernel will allow when you later attempt to run a container.

  Example
-     remap-uids = 0:1668442479:65536
-     remap-gids = 0:1668442479:65536
+     remap-uids = "0:1668442479:65536"
+     remap-gids = "0:1668442479:65536"

  These mappings tell the container engines to map UID 0 inside of the container to UID 1668442479 outside.  UID 1 will be mapped to 1668442480. UID 2 will be mapped to 1668442481, etc, for the next 65533 UIDs in succession.

 **remap-user**=""
 **remap-group**=""
-  Remap-User/Group is a user name which can be used to look up one or more UID/GID ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting with an in-container ID of 0 and then a host-level ID taken from the lowest range that matches the specified name, and using the length of that range. Additional ranges are then assigned, using the ranges which specify the lowest host-level IDs first, to the lowest not-yet-mapped in-container ID, until all of the entries have been used for maps.
+  Remap-User/Group is a user name which can be used to look up one or more UID/GID ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting with an in-container ID of 0 and then a host-level ID taken from the lowest range that matches the specified name, and using the length of that range. Additional ranges are then assigned, using the ranges which specify the lowest host-level IDs first, to the lowest not-yet-mapped in-container ID, until all of the entries have been used for maps.  This setting overrides the Remap-UIDs/GIDs setting.

  Example
     remap-user = "containers"
@ -331,7 +353,7 @@ This is a way to prevent xfs_quota management from conflicting with containers/s

 Distributions often provide a `/usr/share/containers/storage.conf` file to define default storage configuration. Administrators can override this file by creating `/etc/containers/storage.conf` to specify their own configuration. Likewise rootless users can create a storage.conf file to override the system storage.conf files. Files should be stored in the `$XDG_CONFIG_HOME/containers/storage.conf` file.  If `$XDG_CONFIG_HOME` is not set then the file `$HOME/.config/containers/storage.conf` is used.

-Note: The storage.conf file overrides all other strorage.conf files. Container
+Note: The storage.conf file overrides all other storage.conf files. Container
 engines run by users with a storage.conf file in their home directory do not
 use options in the system storage.conf files.

--- a/SOURCES/containers-transports.5.md
+++ b/SOURCES/containers-transports.5.md
@ -16,6 +16,8 @@ they are evaluated. For example: if evaluated on a remote server, image names
 might refer to paths on that server; relative paths are relative to the current
 directory of the image consumer.

+<!-- atomic: is deprecated and not documented here. -->
+
 ### **containers-storage**:[**[**storage-specifier**]**]{image-id|docker-reference[@image-id]}

 An image located in a local containers storage.
@ -38,10 +40,13 @@ By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.js
 If the authorization state is not found there, `$HOME/.docker/config.json` is checked, which is set using docker-login(1).
 The containers-registries.conf(5) further allows for configuring various settings of a registry.

-Note that a _docker-reference_ has the following format: `name[:tag|@digest]`.
+Note that a _docker-reference_ has the following format: _name_[**:**_tag_ | **@**_digest_].
 While the docker transport does not support both a tag and a digest at the same time some formats like containers-storage do.
 Digests can also be used in an image destination as long as the manifest matches the provided digest.
+
+The docker transport supports pushing images without a tag or digest to a registry when the image name is suffixed with **@@unknown-digest@@**. The _name_**@@unknown-digest@@** reference format cannot be used with a reference that has a tag or digest.
 The digest of images can be explored with skopeo-inspect(1).
+
 If `name` does not contain a slash, it is treated as `docker.io/library/name`.
 Otherwise, the component before the first slash is checked if it is recognized as a `hostname[:port]` (i.e., it contains either a . or a :, or the component is exactly localhost).
 If the first component of name is not recognized as a `hostname[:port]`, `name` is treated as `docker.io/name`.
@ -54,7 +59,7 @@ Alternatively, for reading archives, @_source-index_ is a zero-based index in ar
 (to access untagged images).
 If neither _docker-reference_ nor @_source_index is specified when reading an archive, the archive must contain exactly one image.

-It is further possible to copy data to stdin by specifying `docker-archive:/dev/stdin` but note that the used file must be seekable.
+The _path_ can refer to a stream, e.g. `docker-archive:/dev/stdin`.

 ### **docker-daemon:**_docker-reference|algo:digest_

@ -64,18 +69,33 @@ The _algo:digest_ refers to the image ID reported by docker-inspect(1).

 ### **oci:**_path[:reference]_

-An image compliant with the "Open Container Image Layout Specification" at _path_.
-Using a _reference_ is optional and allows for storing multiple images at the same _path_.
+An image in a directory structure compliant with the "Open Container Image Layout Specification" at _path_.
+
+The _path_ value terminates at the first `:` character; any further `:` characters are not separators, but a part of _reference_.
+The _reference_ is used to set, or match, the `org.opencontainers.image.ref.name` annotation in the top-level index.
+If _reference_ is not specified when reading an image, the directory must contain exactly one image.

 ### **oci-archive:**_path[:reference]_

-An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_.
+An image in a tar(1) archive with contents compliant with the "Open Container Image Layout Specification" at _path_.
+
+The _path_ value terminates at the first `:` character; any further `:` characters are not separators, but a part of _reference_.
+The _reference_ is used to set, or match, the `org.opencontainers.image.ref.name` annotation in the top-level index.
+If _reference_ is not specified when reading an archive, the archive must contain exactly one image.

 ### **ostree:**_docker-reference[@/absolute/repo/path]_

 An image in the local ostree(1) repository.
 _/absolute/repo/path_ defaults to _/ostree/repo_.

+### **sif:**_path_
+
+An image using the Singularity image format at _path_.
+
+Only reading images is supported, and not all scripts can be represented in the OCI format.
+
+<!-- tarball: can only usefully be used from Go callers who call tarballReference.ConfigUpdate, and is not documented here. -->
+
 ## Examples

 The following examples demonstrate how some of the containers transports can be used.
--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@ -33,6 +33,11 @@
 #
 #base_hosts_file = ""

+# List of cgroup_conf entries specifying a list of cgroup files to write to and
+# their values. For example `memory.high=1073741824` sets the
+# memory.high limit to 1GB.
+# cgroup_conf = []
+
 # Default way to to create a cgroup namespace for the container
 # Options are:
 # `private` Create private Cgroup Namespace for the container.
@ -64,7 +69,7 @@ default_capabilities = [
  "SETGID",
  "SETPCAP",
  "SETUID",
-  "SYS_CHROOT"
+  "SYS_CHROOT",
 ]

 # A list of sysctls to be set in containers by default,
@ -115,7 +120,6 @@ default_sysctls = [
 #
 #env = [
 #  "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#  "TERM=xterm",
 #]

 # Pass all host environment variables into the container.
@ -146,6 +150,9 @@ default_sysctls = [
 #init = false

 # Container init binary, if init=true, this is the init binary to be used for containers.
+# If this option is not set catatonit is searched in the directories listed under
+# the helper_binaries_dir option. It is recommended to just install catatonit
+# there instead of configuring this option here.
 #
 #init_path = "/usr/libexec/podman/catatonit"

@ -169,6 +176,12 @@ default_sysctls = [
 #
 #label = true

+# label_users indicates whether to enforce confined users in containers on
+# SELinux systems. This option causes containers to maintain the current user
+# and role field of the calling process. By default SELinux containers run with
+# the user system_u, and the role system_r.
+#label_users = false
+
 # Logging driver for the container. Available options: k8s-file and journald.
 #
 #log_driver = "k8s-file"
@ -187,6 +200,13 @@ log_driver = "k8s-file"
 #
 #log_tag = ""

+# List of mounts. Specified as
+# "type=TYPE,source=<directory-on-host>,destination=<directory-in-container>,<options>", for example:
+# "type=bind,source=/var/lib/foobar,destination=/var/lib/foobar,ro".
+# If it is empty or commented out, no mounts will be added
+#
+#mounts = []
+
 # Default way to to create a Network namespace for the container
 # Options are:
 # `private` Create private Network Namespace for the container.
@ -200,6 +220,10 @@ log_driver = "k8s-file"
 #
 #no_hosts = false

+# Tune the host's OOM preferences for containers
+# (accepts values from -1000 to 1000).
+#oom_score_adj = 0
+
 # Default way to to create a PID namespace for the container
 # Options are:
 # `private` Create private PID Namespace for the container.
@ -218,6 +242,22 @@ log_driver = "k8s-file"
 #
 #prepare_volume_on_create = false

+# Give extended privileges to all containers. A privileged container turns off
+# the security features that isolate the container from the host. Dropped
+# Capabilities, limited devices, read-only mount points, Apparmor/SELinux
+# separation, and Seccomp filters are all disabled. Due to the disabled
+# security features the privileged field should almost never be set as
+# containers can easily break out of confinment.
+#
+# Containers running in a user namespace (e.g., rootless containers) cannot
+# have more privileges than the user that launched them.
+#
+#privileged = false
+
+# Run all containers with root file system mounted read-only
+#
+# read_only = false
+
 # Path to the seccomp.json profile which is used as the default seccomp profile
 # for the runtime.
 #
@ -246,12 +286,6 @@ log_driver = "k8s-file"
 #
 #userns = "host"

-# Number of UIDs to allocate for the automatic container creation.
-# UIDs are allocated from the "container" UIDs listed in
-# /etc/subuid & /etc/subgid
-#
-#userns_size = 65536
-
 # Default way to to create a UTS namespace for the container
 # Options are:
 # `private`        Create private UTS Namespace for the container.
@ -266,6 +300,11 @@ log_driver = "k8s-file"
 #
 #volumes = []

+#[engine.platform_to_oci_runtime]
+#"wasi/wasm" = ["crun-wasm"]
+#"wasi/wasm32" = ["crun-wasm"]
+#"wasi/wasm64" = ["crun-wasm"]
+
 [secrets]
 #driver = "file"

@ -295,6 +334,15 @@ network_backend = "cni"
 #  "/opt/cni/bin",
 #]

+# List of directories that will be searched for netavark plugins.
+#
+#netavark_plugin_dirs = [
+#  "/usr/local/libexec/netavark",
+#  "/usr/libexec/netavark",
+#  "/usr/local/lib/netavark",
+#  "/usr/lib/netavark",
+#]
+
 # The network name of the default network to attach pods to.
 #
 #default_network = "podman"
@ -320,6 +368,13 @@ network_backend = "cni"
 #  {"base" = "10.128.0.0/9", "size" = 24},
 #]

+
+
+# Configure which rootless network program to use by default. Valid options are
+# `slirp4netns` (default) and `pasta`.
+#
+#default_rootless_network_cmd = "slirp4netns"
+
 # Path to the directory where network configuration files are located.
 # For the CNI backend the default is "/etc/cni/net.d" as root
 # and "$HOME/.config/cni/net.d" as rootless.
@ -335,16 +390,47 @@ network_backend = "cni"
 #
 #dns_bind_port = 53

+#	A list of default pasta options that should be used running pasta.
+# It accepts the pasta cli options, see pasta(1) for the full list of options.
+#
+#pasta_options = []
+
 [engine]
 # Index to the active service
 #
-#active_service = production
+#active_service = "production"
+
+#List of compression algorithms. If set makes sure that requested compression variant
+#for each platform is added to the manifest list keeping original instance intact in
+#the same manifest list on every `manifest push`. Supported values are (`gzip`, `zstd` and `zstd:chunked`).
+#
+#add_compression = ["gzip", "zstd", "zstd:chunked"]
+
+# Enforces using docker.io for completing short names in Podman's compatibility
+# REST API. Note that this will ignore unqualified-search-registries and
+# short-name aliases defined in containers-registries.conf(5).
+#compat_api_enforce_docker_hub = true
+
+# Specify one or more external providers for the compose command.  The first
+# found provider is used for execution.  Can be an absolute and relative path
+# or a (file) name.
+#compose_providers=[]
+
+# Emit logs on each invocation of the compose command indicating that an
+# external compose provider is being executed.
+#compose_warning_logs = true

 # The compression format to use when pushing an image.
 # Valid options are: `gzip`, `zstd` and `zstd:chunked`.
 #
 #compression_format = "gzip"

+# The compression level to use when pushing an image.
+# Valid options depend on the compression format used.
+# For gzip, valid options are 1-9, with a default of 5.
+# For zstd, valid options are 1-20, with a default of 3.
+#
+#compression_level = 5

 # Cgroup management implementation used for the runtime.
 # Valid options "systemd" or "cgroupfs"
@ -374,11 +460,20 @@ network_backend = "cni"
 # short-name aliases defined in containers-registries.conf(5).
 #compat_api_enforce_docker_hub = true

+# The database backend of Podman.  Supported values are "" (default), "boltdb"
+# and "sqlite". An empty value means it will check whenever a boltdb already
+# exists and use it when it does, otherwise it will use sqlite as default
+# (e.g. new installs). This allows for backwards compatibility with older versions.
+# Please run `podman-system-reset` prior to changing the database
+# backend of an existing deployment, to make sure Podman can operate correctly.
+#
+#database_backend = ""
+
 # Specify the keys sequence used to detach a container.
 # Format is a single character [a-Z] or a comma separated sequence of
 # `ctrl-<value>`, where `<value>` is one of:
 # `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
-#
+# Specifying "" disables this feature.
 #detach_keys = "ctrl-p,ctrl-q"

 # Determines whether engine will reserve ports on the host when they are
@ -415,6 +510,10 @@ network_backend = "cni"
 #events_logger = "journald"
 events_logger = "file"

+# Creates a more verbose container-create event which includes a JSON payload
+# with detailed information about the container.
+#events_container_create_inspect_data = false
+
 # A is a list of directories which are used to search for helper binaries.
 #
 #helper_binaries_dir = [
@ -445,7 +544,7 @@ events_logger = "file"
 #
 #image_parallel_copies = 0

-# Tells container engines how to handle the builtin image volumes.
+# Tells container engines how to handle the built-in image volumes.
 #   * bind: An anonymous named volume will be created and mounted
 #     into the container.
 #   * tmpfs: The volume is mounted onto the container as a tmpfs,
@ -461,26 +560,30 @@ events_logger = "file"

 # Infra (pause) container image name for pod infra containers.  When running a
 # pod, we start a `pause` process in a container to hold open the namespaces
-# associated with the  pod.  This container does nothing other then sleep,
-# reserving the pods resources for the lifetime of the pod. By default container
-# engines run a builtin container using the pause executable. If you want override
+# associated with the  pod.  This container does nothing other than sleep,
+# reserving the pod's resources for the lifetime of the pod. By default container
+# engines run a built-in container using the pause executable. If you want override
 # specify an image to pull.
 #
 #infra_image = ""

+# Default Kubernetes kind/specification of the kubernetes yaml generated with the `podman kube generate` command.
+# The possible options are `pod` and `deployment`.
+#kube_generate_type = "pod"
+
 # Specify the locking mechanism to use; valid values are "shm" and "file".
 # Change the default only if you are sure of what you are doing, in general
 # "file" is useful only on platforms where cgo is not available for using the
 # faster "shm" lock type. You may need to run "podman system renumber" after
 # you change the lock type.
 #
-#lock_type** = "shm"
+#lock_type = "shm"

 # MultiImageArchive - if true, the container engine allows for storing archives
 # (e.g., of the docker-archive transport) with multiple images.  By default,
 # Podman creates single-image archives.
 #
-#multi_image_archive = "false"
+#multi_image_archive = false

 # Default engine namespace
 # If engine is joined to a namespace, it will see only containers and pods
@ -548,7 +651,7 @@ runtime = "runc"
 # List of the OCI runtimes that support --format=json. When json is supported
 # engine will use it for reporting nicer errors.
 #
-#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun"]

 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
@ -586,12 +689,12 @@ runtime = "runc"

 # map of service destinations
 #
-#[service_destinations]
-#  [service_destinations.production]
+# [engine.service_destinations]
+#  [engine.service_destinations.production]
 #     URI to access the Podman service
 #     Examples:
-#       rootless "unix://run/user/$UID/podman/podman.sock" (Default)
-#       rootful "unix://run/podman/podman.sock (Default)
+#       rootless "unix:///run/user/$UID/podman/podman.sock" (Default)
+#       rootful "unix:///run/podman/podman.sock (Default)
 #       remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
 #       remote rootful ssh://root@10.10.1.136:22/run/podman/podman.sock
 #
@ -616,6 +719,9 @@ runtime = "runc"
 # A value of 0 is treated as no timeout.
 #volume_plugin_timeout = 5

+# Default timeout in seconds for podmansh logins.
+#podmansh_timeout = 30
+
 # Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc)
 [engine.runtimes]
 #crun = [
@ -659,6 +765,13 @@ runtime = "runc"
 #  "/run/current-system/sw/bin/runsc",
 #]

+#youki = [
+#  "/usr/local/bin/youki",
+#  "/usr/bin/youki",
+#  "/bin/youki",
+#  "/run/current-system/sw/bin/youki",
+#]
+
 #krun = [
 #  "/usr/bin/krun",
 #  "/usr/local/bin/krun",
@ -685,7 +798,7 @@ runtime = "runc"
 # "https://example.com/linux/amd64/foobar.ami" on a Linux AMD machine.
 # The default value is `testing`.
 #
-# image = "testing"
+#image = "testing"

 # Memory in MB a machine is created with.
 #
@ -701,12 +814,25 @@ runtime = "runc"
 # the source and destination. An optional third field `:ro` can be used to
 # tell the container engines to mount the volume readonly.
 #
-# volumes = [
+#volumes = [
 #  "$HOME:$HOME",
 #]

+# Virtualization provider used to run Podman machine.
+# If it is empty or commented out, the default provider will be used.
+#
+#provider = ""
+
 # The [machine] table MUST be the last entry in this file.
 # (Unless another table is added)
 # TOML does not provide a way to end a table other than a further table being
 # defined, so every key hereafter will be part of [machine] and not the
 # main config.
+
+[farms]
+#
+# the default farm to use when farming out builds
+# default = ""
+#
+# map of existing farms
+#[farms.list]
--- a/SOURCES/containers.conf.5.md
+++ b/SOURCES/containers.conf.5.md
@ -9,11 +9,12 @@ Container engines like Podman & Buildah read containers.conf file, if it exists
 and modify the defaults for running containers on the host. containers.conf uses
 a TOML format that can be easily modified and versioned.

-Container engines read the /usr/share/containers/containers.conf and
-/etc/containers/containers.conf, and /etc/containers/containers.conf.d/*.conf files
-if they exist. When running in rootless mode, they also read
-$HOME/.config/containers/containers.conf and
-$HOME/.config/containers/containers.conf.d/*.conf files.
+Container engines read the __/usr/share/containers/containers.conf__,
+__/etc/containers/containers.conf__, and __/etc/containers/containers.conf.d/\*.conf__
+files if they exist.
+When running in rootless mode, they also read
+__$HOME/.config/containers/containers.conf__ and
+__$HOME/.config/containers/containers.conf.d/\*.conf__ files.

 Fields specified in containers conf override the default options, as well as
 options in previously read containers.conf files.
@ -22,13 +23,47 @@ Config files in the `.d` directories, are added in alpha numeric sorted order an

 Not all options are supported in all container engines.

-Note container engines also use other configuration files for configuring the environment.
+Note, container engines also use other configuration files for configuring the environment.

 * `storage.conf` for configuration of container and images storage.
-* `registries.conf` for definition of container registires to search while pulling.
+* `registries.conf` for definition of container registries to search while pulling.
 container images.
 * `policy.conf` for controlling which images can be pulled to the system.

+## ENVIRONMENT VARIABLES
+If the `CONTAINERS_CONF` environment variable is set, all system and user
+config files are ignored and only the specified config file will be loaded.
+
+If the `CONTAINERS_CONF_OVERRIDE` path environment variable is set, the config
+file will be loaded last even when `CONTAINERS_CONF` is set.
+
+The values of both environment variables may be absolute or relative paths, for
+instance, `CONTAINERS_CONF=/tmp/my_containers.conf`.
+
+## MODULES
+A module is a containers.conf file located directly in or a sub-directory of the following three directories:
+ - __$HOME/.config/containers/containers.conf.modules__
+ - __/etc/containers/containers.conf.modules__
+ - __/usr/share/containers/containers.conf.modules__
+
+Files in those locations are not loaded by default but only on-demand.  They are loaded after all system and user configuration files but before `CONTAINERS_CONF_OVERRIDE` hence allowing for overriding system and user configs.
+
+Modules are currently supported by podman(1).  The `podman --module` flag allows for loading a module and can be specified multiple times.  If the specified value is an absolute path, the config file will be loaded directly.  Relative paths are resolved relative to the three module directories mentioned above and in the specified order such that modules in `$HOME` allow for overriding those in `/etc` and `/usr/share`.  Modules in `$HOME` (or `$XDG_CONFIG_HOME` if specified) are only used for rootless users.
+
+## APPENDING TO STRING ARRAYS
+
+The default behavior during the loading sequence of multiple containers.conf files is to override previous data.  To change the behavior from overriding to appending, you can set the `append` attribute as follows: `array=["item-1", "item=2", ..., {append=true}]`.  Setting the append attribute instructs to append to this specific string array for the current and also subsequent loading steps.  To change back to overriding, set `{append=false}`.
+
+Consider the following example:
+```
+modules1.conf: env=["1=true"]
+modules2.conf: env=["2=true"]
+modules3.conf: env=["3=true", {append=true}]
+modules3.conf: env=["4=true"]
+```
+
+After loading the files in the given order, the final contents are `env=["2=true", "3=true", "4=true"]`.  If modules4.conf would set `{append=false}`, the final contents would be `env=["4=true"]`.
+
 # FORMAT
 The [TOML format][toml] is used as the encoding of the configuration file.
 Every option is nested under its table. No bare options are used. The format of
@ -50,6 +85,7 @@ TOML can be simplified to:
 The containers table contains settings to configure and manage the OCI runtime.

 **annotations** = []
+
 List of annotations. Specified as "key=value" pairs to be added to all containers.

 Example: "run.oci.keep_original_groups=1"
@ -66,6 +102,12 @@ file. This must be either an absolute path or as special values "image" which
 uses the hosts file from the container image or "none" which means
 no base hosts file is used. The default is "" which will use /etc/hosts.

+**cgroup_conf**=[]
+
+List of cgroup_conf entries specifying a list of cgroup files to write to and
+their values. For example `memory.high=1073741824` sets the
+memory.high limit to 1GB.
+
 **cgroups**="enabled"

 Determines  whether  the  container will create CGroups.
@ -88,15 +130,13 @@ List of default capabilities for containers.
 The default list is:
 ```
 default_capabilities = [
-"AUDIT_WRITE",
      "CHOWN",
      "DAC_OVERRIDE",
      "FOWNER",
      "FSETID",
      "KILL",
-      "MKNOD",
      "NET_BIND_SERVICE",
-      "NET_RAW",
+      "SETFCAP",
      "SETGID",
      "SETPCAP",
      "SETUID",
@ -104,6 +144,10 @@ default_capabilities = [
 ]
 ```

+Note, by default container engines using containers.conf, run with less
+capabilities than Docker. Docker runs additionally with "AUDIT_WRITE", "MKNOD" and "NET_RAW". If you need to add one of these capabilities for a
+particular container, you can use the --cap-add option or edit your system's containers.conf.
+
 **default_sysctls**=[]

 A list of sysctls to be set in containers by default,
@ -141,7 +185,7 @@ A list of dns servers to override the DNS configuration passed to the
 container. The special value “none” can be specified to disable creation of
 /etc/resolv.conf in the container.

-**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "TERM=xterm"]
+**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"]

 Environment variable list for the container process, used for passing
 environment variables to the container.
@ -175,6 +219,10 @@ Run an init inside the container that forwards signals and reaps processes.

 **init_path**="/usr/libexec/podman/catatonit"

+If this option is not set catatonit is searched in the directories listed under
+the **helper_binaries_dir** option. It is recommended to just install catatonit
+there instead of configuring this option here.
+
 Path to the container-init binary, which forwards signals and reaps processes
 within containers. Note that the container-init binary will only be used when
 the `--init` for podman-create and podman-run is set.
@ -197,6 +245,13 @@ the container.

 Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.

+**label_users**=false
+
+label_users indicates whether to enforce confined users in containers on
+SELinux systems. This option causes containers to maintain the current user
+and role field of the calling process. By default SELinux containers run with
+the user system_u, and the role system_r.
+
 **log_driver**=""

 Logging driver for the container. Currently available options are k8s-file, journald, none and passthrough, with json-file aliased to k8s-file for scripting compatibility.  The journald driver is used by default if the systemd journal is readable and writable.  Otherwise, the k8s-file driver is used.
@ -212,6 +267,13 @@ limit is never exceeded.

 Default format tag for container log messages. This is useful for creating a specific tag for container log messages. Container log messages default to using the truncated container ID as a tag.

+**mounts**=[]
+
+List of mounts.
+Specified as "type=TYPE,source=<directory-on-host>,destination=<directory-in-container>,<options>"
+
+Example:  [ "type=bind,source=/var/lib/foobar,destination=/var/lib/foobar,ro", ]
+
 **netns**="private"

 Default way to to create a NET namespace for the container.
@ -225,6 +287,10 @@ Options are:
 Create /etc/hosts for the container. By default, container engines manage
 /etc/hosts, automatically adding  the container's  own  IP  address.

+**oom_score_adj**=0
+
+Tune the host's OOM preferences for containers (accepts values from -1000 to 1000).
+
 **pidns**="private"

 Default way to to create a PID namespace for the container.
@ -241,6 +307,16 @@ is imposed.

 Copy the content from the underlying image into the newly created volume when the container is created instead of when it is started. If `false`, the container engine will not copy the content until the container is started. Setting it to `true` may have negative performance implications.

+**privileged**=false
+
+Give extended privileges to all containers. A privileged container turns off the security features that isolate the container from the host. Dropped Capabilities, limited devices, read-only mount points, Apparmor/SELinux separation, and Seccomp filters are all disabled. Due to the disabled security features, the privileged field should almost never be set as containers can easily break out of confinment.
+
+Containers running in a user namespace (e.g., rootless containers) cannot have more privileges than the user that launched them.
+
+**read_only**=true|false
+
+Run all containers with root file system mounted read-only. Set to false by default.
+
 **seccomp_profile**="/usr/share/containers/seccomp.json"

 Path to the seccomp.json profile which is used as the default seccomp profile
@ -275,11 +351,6 @@ Options are:
  `private` Create private USER Namespace for the container.
  `host`    Share host USER Namespace with the container.

-**userns_size**=65536
-
-Number of UIDs to allocate for the automatic container creation. UIDs are
-allocated from the “container” UIDs listed in /etc/subuid & /etc/subgid.
-
 **utsns**="private"

 Default way to to create a UTS namespace for the container.
@ -323,6 +394,20 @@ cni_plugin_dirs = [
 ]
 ```

+**netavark_plugin_dirs**=[]
+
+List of directories that will be searched for netavark plugins.
+
+The default list is:
+```
+netavark_plugin_dirs = [
+  "/usr/local/libexec/netavark",
+  "/usr/libexec/netavark",
+  "/usr/local/lib/netavark",
+  "/usr/lib/netavark",
+]
+```
+
 **default_network**="podman"

 The network name of the default network to attach pods to.
@ -351,11 +436,16 @@ default_subnet_pools = [
 ]
 ```

+**default_rootless_network_cmd**="slirp4netns"
+
+Configure which rootless network program to use by default. Valid options are
+`slirp4netns` (default) and `pasta`.
+
 **network_config_dir**="/etc/cni/net.d/"

 Path to the directory where network configuration files are located.
-For the CNI backend the default is "/etc/cni/net.d" as root
-and "$HOME/.config/cni/net.d" as rootless.
+For the CNI backend the default is __/etc/cni/net.d__ as root
+and __$HOME/.config/cni/net.d__ as rootless.
 For the netavark backend "/etc/containers/networks" is used as root
 and "$graphroot/networks" as rootless.

@ -366,6 +456,11 @@ mode and dns enabled.
 Using an alternate port might be useful if other dns services should
 run on the machine.

+**pasta_options** = []
+
+A list of default pasta options that should be used running pasta.
+It accepts the pasta cli options, see pasta(1) for the full list of options.
+
 ## ENGINE TABLE
 The `engine` table contains configuration options used to set up container engines such as Podman and Buildah.

@ -373,11 +468,39 @@ The `engine` table contains configuration options used to set up container engin

 Name of destination for accessing the Podman service. See SERVICE DESTINATION TABLE below.

+**add_compression**=[]
+
+List of compression algorithms. If set makes sure that requested compression variant
+for each platform is added to the manifest list keeping original instance intact in
+the same manifest list on every `manifest push`. Supported values are (`gzip`, `zstd` and `zstd:chunked`).
+
+Note: This is different from `compression_format` which allows users to select a default
+compression format for `push` and `manifest push`, while `add_compression` is limited to
+`manifest push` and allows users to append new instances to manifest list with specified compression
+algorithms in `add_compression` for each platform.
+
 **cgroup_manager**="systemd"

 The cgroup management implementation used for the runtime. Supports `cgroupfs`
 and `systemd`.

+**compat_api_enforce_docker_hub**=true
+
+Enforce using docker.io for completing short names in Podman's compatibility
+REST API. Note that this will ignore unqualified-search-registries and
+short-name aliases defined in containers-registries.conf(5).
+
+**compose_providers**=[]
+
+Specify one or more external providers for the compose command.  The first
+found provider is used for execution.  Can be an absolute and relative path or
+a (file) name.
+
+**compose_warning_logs**=true
+
+Emit logs on each invocation of the compose command indicating that an external
+compose provider is being executed.
+
 **conmon_env_vars**=[]

 Environment variables to pass into Conmon.
@ -402,6 +525,15 @@ conmon_path=[
 ]
 ```

+**database_backend**=""
+
+The database backend of Podman.  Supported values are "" (default), "boltdb"
+and "sqlite". An empty value means it will check whenever a boltdb already
+exists and use it when it does, otherwise it will use sqlite as default
+(e.g. new installs). This allows for backwards compatibility with older versions.
+Please run `podman-system-reset` prior to changing the database
+backend of an existing deployment, to make sure Podman can operate correctly.
+
 **detach_keys**="ctrl-p,ctrl-q"

 Keys sequence used for detaching a container.
@ -409,6 +541,7 @@ Specify the keys sequence used to detach a container.
 Format is a single character `[a-Z]` or a comma separated sequence of
 `ctrl-<value>`, where `<value>` is one of:
 `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
+Specifying "" disables this feature.

 **enable_port_reservation**=true

@ -451,17 +584,35 @@ use this command:

 Valid values are: `file`, `journald`, and `none`.

+**events_container_create_inspect_data**=true|false
+
+Creates a more verbose container-create event which includes a JSON payload
+with detailed information about the container.  Set to false by default.
+
 **helper_binaries_dir**=["/usr/libexec/podman", ...]

 A is a list of directories which are used to search for helper binaries.
+The following binaries are searched in these directories:
+ - aardvark-dns
+ - catatonit
+ - netavark
+ - pasta
+ - slirp4netns
+
+Podman machine uses it for these binaries:
+ - gvproxy
+ - qemu
+ - vfkit

 The default paths on Linux are:
+
 - `/usr/local/libexec/podman`
 - `/usr/local/lib/podman`
 - `/usr/libexec/podman`
 - `/usr/lib/podman`

 The default paths on macOS are:
+
 - `/usr/local/opt/podman/libexec`
 -	`/opt/homebrew/bin`
 -	`/opt/homebrew/opt/podman/libexec`
@ -472,6 +623,7 @@ The default paths on macOS are:
 -	`/usr/lib/podman`

 The default path on Windows is:
+
 - `C:\Program Files\RedHat\Podman`

 **hooks_dir**=["/etc/containers/oci/hooks.d", ...]
@ -496,7 +648,7 @@ Not setting this field will fall back to containers/image defaults. (6)

 **image_volume_mode**="bind"

-Tells container engines how to handle the builtin image volumes.
+Tells container engines how to handle the built-in image volumes.

 * bind: An anonymous named volume will be  created  and  mounted into the container.
 * tmpfs: The volume is mounted onto the container as a tmpfs, which allows the users to create content that disappears when the container is stopped.
@ -506,18 +658,22 @@ Tells container engines how to handle the builtin image volumes.

 Infra (pause) container image command for pod infra containers. When running a
 pod, we start a `/pause` process in a container to hold open the namespaces
-associated with the pod. This container does nothing other then sleep,
-reserving the pods resources for the lifetime of the pod.
+associated with the pod. This container does nothing other than sleep,
+reserving the pod's resources for the lifetime of the pod.

 **infra_image**=""

 Infra (pause) container image for pod infra containers. When running a
 pod, we start a `pause` process in a container to hold open the namespaces
-associated with the pod. This container does nothing other then sleep,
-reserving the pods resources for the lifetime of the pod. By default container
-engines run a builtin container using the pause executable. If you want override
+associated with the pod. This container does nothing other than sleep,
+reserving the pod's resources for the lifetime of the pod. By default container
+engines run a built-in container using the pause executable. If you want override
 specify an image to pull.

+**kube_generate_type**="pod"
+
+Default Kubernetes kind/specification of the kubernetes yaml generated with the `podman kube generate` command. The possible options are `pod` and `deployment`.
+
 **lock_type**="shm"

 Specify the locking mechanism to use; valid values are "shm" and "file".
@ -589,6 +745,7 @@ Pull image before running or creating a container. The default is **missing**.
 - **never**: do not pull the image from the registry, use only the local version. Raise an error if the image is not present locally.

 **remote** = false
+
 Indicates whether the application should be running in remote mode. This flag modifies the
 --remote option on container engines. Setting the flag to true will default `podman --remote=true` for access to the remote Podman service.

@ -598,7 +755,7 @@ Default OCI specific runtime in runtimes that will be used by default. Must
 refer to a member of the runtimes table. Default runtime will be searched for
 on the system using the priority: "crun", "runc", "kata".

-**runtime_supports_json**=["crun", "runc", "kata", "runsc", "krun"]
+**runtime_supports_json**=["crun", "runc", "kata", "runsc", "youki", "krun"]

 The list of the OCI runtimes that support `--format=json`.

@ -655,22 +812,33 @@ not be by other drivers.
 Determines whether file copied into a container will have changed ownership to
 the primary uid/gid of the container.

-**compression_format**=""
+**compression_format**="gzip"

 Specifies the compression format to use when pushing an image. Supported values are: `gzip`, `zstd` and `zstd:chunked`.

-## SERVICE DESTINATION TABLE
-The `service_destinations` table contains configuration options used to set up remote connections to the podman service for the podman API.
+**compression_level**="5"

-**[service_destinations.{name}]**
+The compression level to use when pushing an image. Valid options
+depend on the compression format used. For gzip, valid options are
+1-9, with a default of 5. For zstd, valid options are 1-20, with a
+default of 3.
+
+**podmansh_timeout**=30
+
+Number of seconds to wait for podmansh logins.
+
+## SERVICE DESTINATION TABLE
+The `engine.service_destinations` table contains configuration options used to set up remote connections to the podman service for the podman API.
+
+**[engine.service_destinations.{name}]**
 URI to access the Podman service
 **uri="ssh://user@production.example.com/run/user/1001/podman/podman.sock"**

  Example URIs:

- **rootless local**  - unix://run/user/1000/podman/podman.sock
+- **rootless local**  - unix:///run/user/1000/podman/podman.sock
 - **rootless remote** - ssh://user@engineering.lab.company.com/run/user/1000/podman/podman.sock
- **rootful local**  - unix://run/podman/podman.sock
+- **rootful local**  - unix:///run/podman/podman.sock
 - **rootful remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock

 **identity="~/.ssh/id_rsa**
@ -684,6 +852,10 @@ used as the backend for Podman named volumes. Individual plugins are specified
 below, as a map of the plugin name (what the plugin will be called) to its path
 (filepath of the plugin's unix socket).

+**[engine.platform_to_oci_runtime]**
+
+Allows end users to switch the OCI runtime on the bases of container image's platform string.
+Following config field contains a map of `platform/string = oci_runtime`.

 ## SECRET TABLE
 The `secret` table contains settings for the configuration of the secret subsystem.
@ -735,27 +907,47 @@ Environment variables like $HOME as well as complete paths are supported for
 the source and destination. An optional third field `:ro` can be used to
 tell the container engines to mount the volume readonly.

+On Mac, the default volumes are:
+
+   [ "/Users:/Users", "/private:/private", "/var/folders:/var/folders" ]
+
+**provider**=""
+
+Virtualization provider to be used for running a podman-machine VM. Empty value
+is interpreted as the default provider for the current host OS. On Linux/Mac
+default is `QEMU` and on Windows it is `WSL`.
+
+## FARMS TABLE
+The `farms` table contains configuration options used to group up remote connections into farms that will be used when sending out builds to different machines in a farm via `podman buildfarm`.
+
+**default**=""
+
+The default farm to use when farming out builds.
+
+**[farms.list]**
+
+Map of farms created where the key is the farm name and the value is the list of system connections.
+
 # FILES

 **containers.conf**

-Distributions often provide a `/usr/share/containers/containers.conf` file to
-define default container configuration. Administrators can override fields in
-this file by creating `/etc/containers/containers.conf` to specify their own
-configuration. Rootless users can further override fields in the config by
-creating a config file stored in the `$HOME/.config/containers/containers.conf` file.
+Distributions often provide a __/usr/share/containers/containers.conf__ file to
+provide a default configuration. Administrators can override fields in this
+file by creating __/etc/containers/containers.conf__ to specify their own
+configuration. They may also drop `.conf` files in
+__/etc/containers/containers.conf.d__ which will be loaded in alphanumeric order.
+Rootless users can further override fields in the config by creating a config
+file stored in the __$HOME/.config/containers/containers.conf__ file or __.conf__ files in __$HOME/.config/containers/containers.conf.d__.

-If the `CONTAINERS_CONF` path environment variable is set, just
-this path will be used. This is primarily used for testing.
-
-Fields specified in the containers.conf file override the default options, as
-well as options in previously read containers.conf files.
+Fields specified in a containers.conf file override the default options, as
+well as options in previously loaded containers.conf files.

 **storage.conf**

 The `/etc/containers/storage.conf` file is the default storage configuration file.
 Rootless users can override fields in the storage config by creating
-`$HOME/.config/containers/storage.conf`.
+__$HOME/.config/containers/storage.conf__.

 If the `CONTAINERS_STORAGE_CONF` path environment variable is set, this path
 is used for the storage.conf file rather than the default.
--- a/SOURCES/pyxis.sh
+++ b/SOURCES/pyxis.sh
@ -1,63 +1,47 @@
 #!/bin/bash
-#set -e
+set -e
 rm -f /tmp/pyxis*.json
 TOTAL=`curl -s --negotiate -u: -H 'Content-Type: application/json' -H 'Accept: application/json' -X GET "https://pyxis.engineering.redhat.com/v1/repositories?page_size=1" | jq .total`
 if [ "$TOTAL" == "null" ]; then
  echo "Error comunicating with Pyxis API."
  exit 1
 fi
-PAGES=$(($TOTAL/500))
+PAGES=$(($TOTAL/250))
 for P in `seq 0 $PAGES`; do
  curl -s --negotiate -u: -H 'Content-Type: application/json' -H 'Accept: application/json' -X GET "https://pyxis.engineering.redhat.com/v1/repositories?page_size=500&page=$P" > /tmp/pyxis$P.json
 done
 cat /tmp/pyxis*.json > /tmp/pyx.json
+rm -f /tmp/pyx_debug
 rm -f /tmp/rhel-shortnames.conf
-while read -r LINE; do
-  if [[ "$LINE" == *\"_id\":* ]] || [[ "$LINE" == *\"total\":* ]]; then
-    if [ -z $REGISTRY ] ||
-       [ -z $PUBLISHED ] ||
-       [ -z $REPOSITORY ] ||
-       [  $REPOSITORY == \"\" ] ||
-       [ "$AVAILABLE" != "Generally Available" ] ||
-       [[ $REPOSITORY == *[@:]* ]] ||
-       [[ $REPOSITORY == *[* ]] ||
-       [[ "$REGISTRY" == *non_registry* ]] ||
-       [[ $REGISTRY != *.* ]]
-     then
-      continue
-    fi
+jq '.data[]|.published,.requires_terms,.repository,.registry,.release_categories[0]' < /tmp/pyx.json >/tmp/pyx
+readarray -t lines < /tmp/pyx
+IDX=0
+while [ $IDX -lt ${#lines[@]} ]; do
+  PUBLISHED=${lines[$IDX]}
+  REQ_TERMS=${lines[$IDX+1]}
+  REPOSITORY=`echo ${lines[$IDX+2]} | tr -d '"'`
+  REGISTRY=`echo ${lines[$IDX+3]} | tr -d '"'`
+  RELEASE=`echo ${lines[$IDX+4]} | tr -d '"'`
+  if [ "$PUBLISHED" == "true" ] &&
+     [ "$RELEASE" == "Generally Available" ] &&
+     [ ! -z "$REPOSITORY" ] &&
+     [ "$REPOSITORY" != \"\" ] &&
+     [[ $REPOSITORY != *[@:]* ]] &&
+     [[ $REPOSITORY != *[* ]] &&
+     [[ $REGISTRY == *.* ]] &&
+     [ "$REGISTRY" != "non_registry" ]; then
    if [[ $REGISTRY == *quay.io* ]] ||
       [[ $REGISTRY == *redhat.com* ]]; then
-      if [ "$REQUIRES_TERMS" == "1" ]; then
+      if [ "$REQ_TERMS" == "true" ]; then
        REGISTRY=registry.redhat.io
      fi
-      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
-      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
    fi
-    REGISTRY=""
-    PUBLISHED=""
-    AVAILABLE=""
-    REPOSITORY=""
-    REQUIRES_TERMS=""
-    continue
+    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
+    echo $PUBLISHED,$REQ_TERMS,$REPOSITORY,$REGISTRY,$RELEASE >> /tmp/pyx_debug
+    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
  fi
-  if [[ "$LINE" == *\"published\":\ true,* ]]; then
-    PUBLISHED=1
-  fi
-  if [[ "$LINE" == *\"requires_terms\":\ true,* ]]; then
-    REQUIRES_TERMS=1
-  fi
-  if [[ "$LINE" == *\"repository\":\ * ]]; then
-    REPOSITORY=`echo $LINE | sed 's,^.* ",,' | sed 's;",$;;'`
-  fi
-  if [[ "$LINE" == *\"registry\":\ * ]]; then
-    REGISTRY=`echo $LINE | sed -e 's,^.*:\ ",,' -e 's,".*,,'`
-  fi
-  if [[ "$LINE" == *\"release_categories\":\ * ]]; then
-    read -r LINE
-    AVAILABLE=`echo $LINE | sed 's,",,g'`
-  fi
-done < /tmp/pyx.json
+  IDX=$(($IDX+5))
+done

 cp /tmp/rhel-shortnames.conf /tmp/r.conf
 for D in `cut -d\  -f1 /tmp/r.conf | sort | uniq -d`; do
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@ -2,6 +2,8 @@
  # almalinux
  "almalinux" = "docker.io/library/almalinux"
  "almalinux-minimal" = "docker.io/library/almalinux-minimal"
+  # Amazon Linux
+  "amazonlinux" = "public.ecr.aws/amazonlinux/amazonlinux"
  # Arch Linux
  "archlinux" = "docker.io/library/archlinux"
  # centos
@ -20,6 +22,8 @@
  # Fedora
  "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
  "fedora" = "registry.fedoraproject.org/fedora"
+  # Gentoo
+  "gentoo" = "docker.io/gentoo/stage3"
  # openSUSE
  "opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
  "opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"
@ -52,10 +56,10 @@
  "rhel7" = "registry.access.redhat.com/rhel7"
  "rhel7.9" = "registry.access.redhat.com/rhel7.9"
  "rhel-atomic" = "registry.access.redhat.com/rhel-atomic"
-  "rhel-minimal" = "registry.access.redhat.com/rhel-minimum"
+  "rhel-minimal" = "registry.access.redhat.com/rhel-minimal"
  "rhel-init" = "registry.access.redhat.com/rhel-init"
  "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
-  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimum"
+  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimal"
  "rhel7-init" = "registry.access.redhat.com/rhel7-init"
  "rhel7/rhel" = "registry.access.redhat.com/rhel7/rhel"
  "rhel7/rhel-atomic" = "registry.access.redhat.com/rhel7/rhel7/rhel-atomic"
@ -119,3 +123,12 @@
  "rust" = "docker.io/library/rust"
  # node
  "node" = "docker.io/library/node"
+  # Grafana Labs
+  "grafana/agent" = "docker.io/grafana/agent"
+  "grafana/grafana" = "docker.io/grafana/grafana"
+  "grafana/k6" = "docker.io/grafana/k6"
+  "grafana/loki" = "docker.io/grafana/loki"
+  "grafana/mimir" = "docker.io/grafana/mimir"
+  "grafana/oncall" = "docker.io/grafana/oncall"
+  "grafana/pyroscope" = "docker.io/grafana/pyroscope"
+  "grafana/tempo" = "docker.io/grafana/tempo"
--- a/SOURCES/storage.conf
+++ b/SOURCES/storage.conf
@ -27,11 +27,21 @@ runroot = "/run/containers/storage"
 # restorecon -R -v /NEWSTORAGEPATH
 graphroot = "/var/lib/containers/storage"

+# Optional alternate location of image store if a location separate from the
+# container store is required. If set, it must be different than graphroot.
+# imagestore = ""
+

 # Storage path for rootless users
 #
 # rootless_storage_path = "$HOME/.local/share/containers/storage"

+# Transient store mode makes all container metadata be saved in temporary storage
+# (i.e. runroot above). This is faster, but doesn't persist across reboots.
+# Additional garbage collection must also be performed at boot-time, so this
+# option should remain disabled in most configurations.
+# transient_store = true
+
 [storage.options]
 # Storage options to be passed to underlying storage drivers

@ -49,7 +59,7 @@ additionalimagestores = [
 # can deduplicate pulling of content, disk storage of content and can allow the
 # kernel to use less memory when running containers.

-# containers/storage supports four keys
+# containers/storage supports three keys
 #   * enable_partial_images="true" | "false"
 #     Tells containers/storage to look for files previously pulled in storage
 #     rather then always pulling them from the container registry.
@ -69,8 +79,8 @@ pull_options = {enable_partial_images = "false", use_hard_links = "false", ostre
 # mappings which the kernel will allow when you later attempt to run a
 # container.
 #
-# remap-uids = 0:1668442479:65536
-# remap-gids = 0:1668442479:65536
+# remap-uids = "0:1668442479:65536"
+# remap-gids = "0:1668442479:65536"

 # Remap-User/Group is a user name which can be used to look up one or more UID/GID
 # ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting
@ -78,7 +88,8 @@ pull_options = {enable_partial_images = "false", use_hard_links = "false", ostre
 # range that matches the specified name, and using the length of that range.
 # Additional ranges are then assigned, using the ranges which specify the
 # lowest host-level IDs first, to the lowest not-yet-mapped in-container ID,
-# until all of the entries have been used for maps.
+# until all of the entries have been used for maps. This setting overrides the
+# Remap-UIDs/GIDs setting.
 #
 # remap-user = "containers"
 # remap-group = "containers"
@ -94,7 +105,7 @@ pull_options = {enable_partial_images = "false", use_hard_links = "false", ostre
 # Auto-userns-min-size is the minimum size for a user namespace created automatically.
 # auto-userns-min-size=1024
 #
-# Auto-userns-max-size is the minimum size for a user namespace created automatically.
+# Auto-userns-max-size is the maximum size for a user namespace created automatically.
 # auto-userns-max-size=65536

 [storage.options.overlay]
--- a/SOURCES/update-vendored.sh
+++ b/SOURCES/update-vendored.sh
@ -7,23 +7,27 @@ CENTOS=""
 pwd | grep /tmp/centos > /dev/null
 if [ $? == 0 ]; then
  CENTOS=1
+  PKG=centpkg
+else
+  PKG=rhpkg
 fi
 set -e
 for P in podman skopeo buildah; do
  BRN=`pwd | sed 's,^.*/,,'`
  rm -rf $P
-  pkg clone $P
+  $PKG clone $P
  cd $P
-  [ -z "$CENTOS" ] && pkg switch-branch $BRN
+  $PKG switch-branch $BRN
  if [ $BRN != stream-container-tools-rhel8 ]; then
-    pkg prep
+    $PKG prep
  else
-    pkg --release rhel-8 prep
+    $PKG --release rhel-8 prep
  fi
-  DIR=`ls -d -- */ | grep -v ^tests | head -n1`
-  grep github.com/containers/image $DIR/go.mod | grep -v - | cut -d\  -f2 >> /tmp/ver_image
-  grep github.com/containers/common $DIR/go.mod | grep -v - | cut -d\  -f2 >> /tmp/ver_common
-  grep github.com/containers/storage $DIR/go.mod | grep -v - | cut -d\  -f2 >> /tmp/ver_storage
+  rm -rf *SPECPARTS
+  DIR=`ls -d -- */ | grep "$P"`
+  grep github.com/containers/image $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,'>> /tmp/ver_image
+  grep github.com/containers/common $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,' >> /tmp/ver_common
+  grep github.com/containers/storage $DIR/go.mod | cut -d\  -f2 | sed 's,-.*,,' >> /tmp/ver_storage
  cd -
 done
 IMAGE_VER=`sort -n /tmp/ver_image | head -n1`
--- a/SOURCES/update.sh
+++ b/SOURCES/update.sh
@ -13,7 +13,7 @@ ensure() {
      sed -i "/^#.*$2[[:blank:]].*=/a \
 $2 = $3" $1
    else
-      echo "$2 = \"$3\"" >> $1
+      echo "$2 = $3" >> $1
    fi
  fi
 }
@ -21,10 +21,18 @@ $2 = $3" $1
 #./pyxis.sh
 #./update-vendored.sh
 spectool -f -g containers-common.spec
+for FILE in *; do
+  [ -s "$FILE" ]
+  if [ $? == 1 ] && [ "$FILE" != "sources" ]; then
+    echo "empty file: $FILE"
+    exit 1
+  fi
+done
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
 if pwd | grep rhel-8 > /dev/null
 then
+awk -i inplace '/#default_capabilities/,/#\]/{gsub("#","",$0)}1' containers.conf
 ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
 ensure containers.conf runtime                       \"runc\"
@ -36,12 +44,24 @@ then
  sed -i '/^default_capabilities/a \
  "NET_RAW",' containers.conf
 fi
+if ! grep \"SYS_CHROOT\" containers.conf > /dev/null
+then
+  sed -i '/^default_capabilities/a \
+  "SYS_CHROOT",' containers.conf
+fi
 else
 ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf runtime                       \"crun\"
 fi
-[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
+[ `grep \"keyctl\", seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
 				"keyctl",' seccomp.json
-sed -i '/\"socketcall\",/i \
+[ `grep \"socket\", seccomp.json | wc -l` == 0 ] && sed -i '/\"socketcall\",/i \
 				"socket",' seccomp.json
+rhpkg clone redhat-release
+cd redhat-release
+rhpkg switch-branch rhel-9.4.0
+rhpkg prep
+cp -f redhat-release-*/RPM-GPG* ../
+cd -
+rm -rf redhat-release
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@ -4,15 +4,15 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global image_branch v5.23.0
-%global common_branch v0.50.1
-%global storage_branch v1.43.0
+%global image_branch v5.29.2
+%global common_branch v0.57.3
+%global storage_branch v1.51.0
 %global shortnames_branch main

 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 49%{?dist}
+Release: 81%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 # arch limitation because of go-md2man (missing on i686)
@ -82,7 +82,8 @@ separately.
 %build

 %install
-install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.d,registries.conf.d}
+install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,systemd,registries.d,registries.conf.d}
+install -dp %{buildroot}%{_datadir}/containers/systemd
 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
 install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
 install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
@ -150,6 +151,8 @@ EOF
 %dir %{_sysconfdir}/containers/oci
 %dir %{_sysconfdir}/containers/oci/hooks.d
 %dir %{_sysconfdir}/containers/registries.conf.d
+%dir %{_sysconfdir}/containers/systemd
+%dir %{_datadir}/containers/systemd
 %if !0%{?rhel} || 0%{?centos}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
@ -172,6 +175,54 @@ EOF
 %{_datadir}/rhel/secrets/*

 %changelog
+* Wed Feb 14 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-81
+- Update shortnames from Pyxis
+- Related: Jira:RHEL-2110
+
+* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-80
+- bump release to preserve upgrade path
+- Resolves: Jira:RHEL-12277
+
+* Thu Feb 08 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-59
+- update vendored components
+- Related: Jira:RHEL-2110
+
+* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-58
+- update vendored components
+- Related: Jira:RHEL-2110
+
+* Wed Oct 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-57
+- fix shortnames for rhel-minimal
+- Related: Jira:RHEL-2110
+
+* Fri Sep 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-56
+- implement GPG auto updating mechanism from redhat-release
+- Resolves: #RHEL-2110
+
+* Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
+- update GPG keys to the current content of redhat-release
+- Resolves: #RHEL-3164
+
+* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
+- update vendored components and shortnames
+- Related: #2176055
+
+* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-53
+- update vendored components
+- Related: #2176055
+
+* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-52
+- update vendored components
+- Related: #2176055
+
+* Tue Mar 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-51
+- be sure default_capabilities contain SYS_CHROOT
+- Resolves: #2166195
+
+* Thu Mar 09 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-50
+- improve shortnames generation
+- Related: #2176055
+
 * Mon Jan 02 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-49
 - update vendored components and configuration files
 - Related: #2123641
				`@ -1 +0,0 @@`
				`a72daf8585b41529269cdffcca3a0b3d4e2f21cd SOURCES/RPM-GPG-KEY-redhat-beta`