23 changed files with 1283 additions and 4114 deletions
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@ -0,0 +1,4 @@
+92a2bbb50398d4326834e37c17d7ad0c2ed68e5f SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
+c43b8b3548ebc251461f5667d01142e4491691a3 SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
+41313c08ae196941064c6b9c8a090be2381cce51 SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
+26c57cd7077cd8088720082889e3f3c9d776e75c SOURCES/netavark-v1.0.3-vendor.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
+SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
+SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
+SOURCES/netavark-v1.0.3-vendor.tar.gz
--- 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 reuse intermediate images whenever possible. This significantly
+  Container engines re-use intermediate images whenever possible. This significantly
  accelerates the *build* process.

 # FORMAT

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

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

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

  -- The **FROM** instruction sets the base image for subsequent instructions. A
  valid Containerfile must have either **ARG** or *FROM** as its first instruction.
@ -82,9 +82,6 @@ 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.
@ -121,7 +118,7 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.

              · dst, destination, target: mount destination spec.

-              · ro, read-only: true (default) or false.
+              · ro, read-only: true or false (default).

       Options specific to bind:

@ -131,8 +128,6 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.

              · from: stage or image name for the root of the source. Defaults to the build context.

-              · rw, read-write: allows writes on the mount.
-
       Options specific to tmpfs:

              · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
@ -155,49 +150,6 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.

              · from: stage name for the root of the source. Defaults to host cache directory.

-              · 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**

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

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

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

  The **COPY** instruction copies new files from `<src>` and
@ -381,16 +333,6 @@ 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
@ -1,29 +0,0 @@
-----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,13 +1,9 @@
-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>
+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>

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

 mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
 0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
@ -35,32 +31,4 @@ 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,33 +5,30 @@ containers-auth.json - syntax for the registry authentication file

 # DESCRIPTION

-A file in JSON format controlling authentication against container image registries.
+A credentials file in JSON format used to authenticate 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 there,
-the search continues in `${XDG_CONFIG_HOME}/containers/auth.json` (usually `~/.config/containers/auth.json`), `$HOME/.docker/config.json`, `$HOME/.dockercfg`.
+If credentials are not present, search in `${XDG_CONFIG_HOME}/containers/auth.json` (usually `~/.config/containers/auth.json`), `$HOME/.docker/config.json`, `$HOME/.dockercfg`.

-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.
+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.


 ## FORMAT

-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
+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
 result in a lookup in `auth.json` in the following order:

 - `my-registry.local/namespace/user/image`
@ -80,8 +77,10 @@ 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 more securely than storing only base64-encoded credentials in `auth.json`.
+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.

 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,9 +30,7 @@ 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,
@ -61,41 +59,18 @@ 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 deprecated `atomic:` transport refers to images in an Atomic Registry.
+The `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 starting with `*.` for matching all
+a host/namespace/image stream or a wildcarded expression 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.
@ -103,10 +78,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:`

@ -116,73 +91,24 @@ 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 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
+a repository namespace, or a registry host (by only specifying the host name)
+or a wildcarded expression for matching all subdomains. 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 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.
+Supported scopes use the form _directory_`:`_tag_, and _directory_ referring to
+a directory containing one or more tags, or any of the parent directories.

-*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.
+*Note:* See `dir:` above for semantics and restrictions on the directory paths, they apply to `oci:` equivalently.

 ### `tarball:`

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

 ## Policy Requirements

@ -223,21 +149,20 @@ This requirement rejects every image, and every signature.

 ### `signedBy`

-This requirement requires an image to be signed using “simple signing” with an expected identity, or accepts a signature if it is using an expected identity and key.
+This requirement requires an image to be signed with an expected identity, or accepts a signature if it is using an expected identity and key.

 ```js
 {
    "type":    "signedBy",
    "keyType": "GPGKeys", /* The only currently supported value */
    "keyPath": "/path/to/local/keyring/file",
-    "keyPaths": ["/path/to/local/keyring/file1","/path/to/local/keyring/file2"…],
    "keyData": "base64-encoded-keyring-data",
    "signedIdentity": identity_requirement
 }
 ```
 <!-- Later: other keyType values -->

-Exactly one of `keyPath`, `keyPaths` and `keyData` must be present, containing a GPG keyring of one or more public keys.  Only signatures made by these keys are accepted.
+Exactly one of `keyPath` and `keyData` must be present, containing a GPG keyring of one or more public keys.  Only signatures made by these keys are accepted.

 The `signedIdentity` field, a JSON object, specifies what image identity the signature claims about the image.
 One of the following alternatives are supported:
@ -311,51 +236,6 @@ used with `exactReference` or `exactRepository`.

 <!-- ### `signedBaseLayer` -->

-
-### `sigstoreSigned`
-
-This requirement requires an image to be signed using a sigstore signature with an expected identity and key.
-
-```js
-{
-    "type":    "sigstoreSigned",
-    "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`, `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 `use-sigstore-attachments` option needs to be enabled for the relevant registry or repository in the client's containers-registries.d(5).
-
 ## Examples

 It is *strongly* recommended to set the `default` policy to `reject`, and then
@ -375,57 +255,10 @@ selectively allow individual transports and scopes as desired.
            "docker.io/openshift": [{"type": "insecureAcceptAnything"}],
            /* Similarly, allow installing the “official” busybox images.  Note how the fully expanded
               form, with the explicit /library/, must be used. */
-            "docker.io/library/busybox": [{"type": "insecureAcceptAnything"}],
+            "docker.io/library/busybox": [{"type": "insecureAcceptAnything"}]
            /* Allow installing images from all subdomains */
-            "*.temporary-project.example.com": [{"type": "insecureAcceptAnything"}],
-            /* A sigstore-signed repository */
-            "hostname:5000/myns/sigstore-signed-with-full-references": [
-                {
-                    "type": "sigstoreSigned",
-                    "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": [
-                {
-                    "type": "sigstoreSigned",
-                    "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 */
+            "*.temporary-project.example.com": [{"type": "insecureAcceptAnything"}]
+            /* Other docker: images use the global default policy and are rejected */
        },
        "dir": {
            "": [{"type": "insecureAcceptAnything"}] /* Allow any images originating in local directories */
@ -468,7 +301,7 @@ selectively allow individual transports and scopes as desired.
                    "signedIdentity": {
                        "type": "remapIdentity",
                        "prefix": "private-mirror:5000/vendor-mirror",
-                        "signedPrefix": "vendor.example.com"
+                        "signedPrefix": "vendor.example.com",
                    }
                }
            ]
--- a/SOURCES/containers-registries.conf.5.md
+++ b/SOURCES/containers-registries.conf.5.md
@ -43,8 +43,6 @@ also include wildcarded subdomains in the format `*.example.com`.
 The wildcard should only be present at the beginning as shown in the formats
 above. Other cases will not work. For example, `*.example.com` is valid but
 `example.*.com`, `*.example.com/foo` and `*.example.com:5000/foo/bar:baz` are not.
-Note that `*` matches an arbitrary number of subdomains. `*.example.com` will hence
-match `bar.example.com`, `foo.bar.example.com` and so on.

 As a special case, the `prefix` field can be missing; if so, it defaults to the value
 of the `location` field (described below).
@ -73,16 +71,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 is equal to `prefix` (in which case `prefix` can be omitted and the
+By default, this 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.com/bar"
+location = "internal-registry-for-example.net/bar"
 ```
 requests for the image `example.com/foo/myimage:latest` will actually work with the
-`internal-registry-for-example.com/bar/myimage:latest` image.
+`internal-registry-for-example.net/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,
@ -99,37 +97,30 @@ as-is. But other settings like insecure/blocked/mirrors will be applied to match

 `mirror`
 : An array of TOML tables specifying (possibly-partial) mirrors for the
-`prefix`-rooted namespace (i.e., the current `[[registry]]` TOML table).
+`prefix`-rooted namespace.

 The mirrors are attempted in the specified order; the first one that can be
 contacted and contains the image will be used (and if none of the mirrors contains the image,
 the primary location specified by the `registry.location` field, or using the unmodified
 user-specified reference, is tried last).

-Each TOML table in the `mirror` array can contain the following fields:
- `location`： same semantics
-as specified in the `[[registry]]` TOML table
- `insecure`： same semantics
-as specified in the `[[registry]]` TOML table
- `pull-from-mirror`: `all`, `digest-only` or `tag-only`.  If "digest-only"， mirrors will only be used for digest pulls. Pulling images by tag can potentially yield different images, depending on which endpoint we pull from.  Restricting mirrors to pulls by digest avoids that issue.  If "tag-only", mirrors will only be used for tag pulls.  For a more up-to-date and expensive mirror that it is less likely to be out of sync if tags move, it should not be unnecessarily used for digest references.  Default is "all" (or left empty), mirrors will be used for both digest pulls and tag pulls unless the mirror-by-digest-only is set for the primary registry.
-Note that this per-mirror setting is allowed only when `mirror-by-digest-only` is not configured for the primary registry.
+Each TOML table in the `mirror` array can contain the following fields, with the same semantics
+as if specified in the `[[registry]]` TOML table directly:
+- `location`
+- `insecure`

 `mirror-by-digest-only`
 : `true` or `false`.
 If `true`, mirrors will only be used during pulling if the image reference includes a digest.
-Note that if all mirrors are configured to be digest-only, images referenced by a tag will only use the primary
-registry.
-If all mirrors are configured to be tag-only, images referenced by a digest will only use the primary
-registry.
-
 Referencing an image by digest ensures that the same is always used
 (whereas referencing an image by a tag may cause different registries to return
 different images if the tag mapping is out of sync).

+Note that if this is `true`, images referenced by a tag will only use the primary
+registry, failing if that registry is not accessible.

-*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.
+*Note*: Redirection and mirrors are currently processed only when reading images, not when pushing
+to a registry; that may change in the future.

 #### Short-Name Aliasing
 The use of unqualified-search registries entails an ambiguity as it is
@ -237,23 +228,14 @@ location = "example-mirror-0.local/mirror-for-foo"
 [[registry.mirror]]
 location = "example-mirror-1.local/mirrors/foo"
 insecure = true
-
-[[registry]]
-location = "registry.com"
-
-[[registry.mirror]]
-location = "mirror.registry.com"
 ```
 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.com/bar/image:latest`
+    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`

 in order, and use the first one that exists.

-Note that a mirror is associated only with the current `[[registry]]` TOML table. If using the example above, pulling the image `registry.com/image:latest` will hence only reach out to `mirror.registry.com`, and the mirrors associated with `example.com/foo` will not be considered.
-
 ## VERSION 1 FORMAT - DEPRECATED
 VERSION 1 format is still supported but it does not support
 using registry mirrors, longest-prefix matches, or location rewriting.
--- a/SOURCES/containers-registries.d.5.md
+++ b/SOURCES/containers-registries.d.5.md
@ -63,31 +63,25 @@ more general scopes is ignored.  For example, if _any_ configuration exists for

 ### Built-in Defaults

-If no `docker` section can be found for the container image, and no `default-docker` section is configured:
-
- The default directory, `/var/lib/containers/sigstore` for root and `$HOME/.local/share/containers/sigstore` for unprivileged user,  will be used for reading and writing signatures.
- Sigstore attachments will not be read/written.
+If no `docker` section can be found for the container image, and no `default-docker` section is configured,
+the default directory, `/var/lib/containers/sigstore` for root and `$HOME/.local/share/containers/sigstore` for unprivileged user,  will be used for reading and writing signatures.

 ## Individual Configuration Sections

 A single configuration section is selected for a container image using the process
 described above.  The configuration section is a YAML mapping, with the following keys:

-<!-- `sigstore` and `sigstore-staging` are deprecated and intentionally not documented here. -->
+- `sigstore-staging` defines an URL of of the signature storage, used for editing it (adding or deleting signatures).

- `lookaside-staging` defines an URL of of the signature storage, used for editing it (adding or deleting signatures).
+   This key is optional; if it is missing, `sigstore` below is used.

-   This key is optional; if it is missing, `lookaside` below is used.
-
- `lookaside` defines an URL of the signature storage.
+- `sigstore` defines an URL of the signature storage.
   This URL is used for reading existing signatures,
-   and if `lookaside-staging` does not exist, also for adding or removing them.
+   and if `sigstore-staging` does not exist, also for adding or removing them.

   This key is optional; if it is missing, no signature storage is defined (no signatures
-   are download along with images, adding new signatures is possible only if `lookaside-staging` is defined).
+   are download along with images, adding new signatures is possible only if `sigstore-staging` is defined).

- `use-sigstore-attachments` specifies whether sigstore image attachments (signatures, attestations and the like) are going to be read/written along with the image.
-   If disabled, the images are treated as if no attachments exist; attempts to write attachments fail.

 ## Examples

@ -98,11 +92,11 @@ The following demonstrates how to to consume and run images from various registr
 ```yaml
 docker:
    registry.database-supplier.com:
-        lookaside: https://lookaside.database-supplier.com
+        sigstore: https://sigstore.database-supplier.com
    distribution.great-middleware.org:
-        lookaside: https://security-team.great-middleware.org/lookaside
+        sigstore: https://security-team.great-middleware.org/sigstore
    docker.io/web-framework:
-        lookaside: https://lookaside.web-framework.io:8080
+        sigstore: https://sigstore.web-framework.io:8080
 ```

 ### Developing and Signing Containers, Staging Signatures
@ -116,13 +110,13 @@ For developers in `example.com`:
 ```yaml
 docker:
    registry.example.com:
-        lookaside: https://registry-lookaside.example.com
+        sigstore: https://registry-sigstore.example.com
    registry.example.com/mydepartment:
-        lookaside: https://lookaside.mydepartment.example.com
-        lookaside-staging: file:///mnt/mydepartment/lookaside-staging
+        sigstore: https://sigstore.mydepartment.example.com
+        sigstore-staging: file:///mnt/mydepartment/sigstore-staging
    registry.example.com/mydepartment/myproject:mybranch:
-        lookaside: http://localhost:4242/lookaside
-        lookaside-staging: file:///home/useraccount/webroot/lookaside
+        sigstore: http://localhost:4242/sigstore
+        sigstore-staging: file:///home/useraccount/webroot/sigstore
 ```

 ### A Global Default
@ -132,7 +126,7 @@ without listing each domain individually. This is expected to rarely happen, usu

 ```yaml
 default-docker:
-    lookaside-staging: file:///mnt/company/common-lookaside-staging
+    sigstore-staging: file:///mnt/company/common-sigstore-staging
 ```

 # AUTHORS
--- a/SOURCES/containers-signature.5.md
+++ b/SOURCES/containers-signature.5.md
@ -68,9 +68,7 @@ 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”,
-  a “Cleartext Signature” as defined in RFC 4880 section 7,
-  or any other non-signature format).
+  (e.g. it MUST NOT be an unsigned “Literal Message”, 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
@ -212,8 +210,7 @@ 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
-(identifying the low-level software implementation; not the top-level caller).
+If present, this MUST be a JSON string, identifying the name and version of the software which has created the signature.

 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
@ -27,55 +27,45 @@ No bare options are used. The format of TOML can be simplified to:
 The `storage` table supports the following options:

 **driver**=""
-  Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "devmapper", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem.
-This field is required to guarantee proper operation.
-Valid rootless drivers are "btrfs", "overlay", and "vfs".
-Rootless users default to the driver defined in the system configuration when possible.
-When the system configuration uses an unsupported rootless driver, rootless users default to "overlay" if available, otherwise "vfs".
+  container storage driver
+  Default Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "devmapper", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem.
+  This field is required to guarantee proper operation.
+  Valid rootless drivers are "btrfs", "overlay", and "vfs".
+  Rootless users default to the driver defined in the system configuration when possible.
+  When the system configuration uses an unsupported rootless driver, rootless users default to "overlay" if available, otherwise "vfs".

 **graphroot**=""
  container storage graph dir (default: "/var/lib/containers/storage")
-Default directory to store all writable content created by container storage programs.
-The rootless graphroot path supports environment variable substitutions (ie. `$HOME/containers/storage`).
-When changing the graphroot location on an SELINUX system, ensure the labeling matches the default locations labels with the following commands:
-
+  Default directory to store all writable content created by container storage programs.
+  The rootless graphroot path supports environment variable substitutions (ie. `$HOME/containers/storage`)
+  When changing the graphroot location on an SELINUX system, ensure
+  the labeling matches the default locations labels with the
+  following commands:
+  
 ```
 # semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH
 # restorecon -R -v /NEWSTORAGEPATH
 ```

-In rootless mode you would set
+  In Rootless Mode you would set

 ```
 # semanage fcontext -a -e $HOME/.local/share/containers NEWSTORAGEPATH
 $ restorecon -R -v /NEWSTORAGEPATH
 ```
 **rootless_storage_path**="$HOME/.local/share/containers/storage"
-  Storage path for rootless users. By default the graphroot for rootless users is set to `$XDG_DATA_HOME/containers/storage`, if XDG_DATA_HOME is set. Otherwise `$HOME/.local/share/containers/storage` is used. This field can be used if administrators need to change the storage location for all users. The rootless storage path supports environment variable substitutions (ie. `$HOME/containers/storage`)
+  Storage path for rootless users. By default the graphroot for rootless users
+  is set to `$XDG_DATA_HOME/containers/storage`, if XDG_DATA_HOME is set.
+  Otherwise `$HOME/.local/share/containers/storage` is used.  This field can
+  be used if administrators need to change the storage location for all users.
+  The rootless storage path supports environment variable substitutions (ie. `$HOME/containers/storage`)

-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`.
+  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).

 **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)
+  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`)

 ### STORAGE OPTIONS TABLE

@ -84,46 +74,19 @@ The `storage.options` table supports the following options:
 **additionalimagestores**=[]
  Paths to additional container image stores. Usually these are read/only and stored on remote network shares.

-**pull_options** = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
-
-Allows specification of how storage is populated when pulling images. This
-option can speed the pulling process of images compressed with format zstd:chunked. Containers/storage looks
-for files within images that are being pulled from a container registry that
-were previously pulled to the host.  It can copy or create
-a hard link to the existing file when it finds them, eliminating the need to pull them from the
-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 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.
-  * use_hard_links = "false" | "true"
-    Tells containers/storage to use hard links rather then create new files in
-    the image, if an identical file already existed in storage.
-  * ostree_repos = ""
-    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.  This setting overrides the Remap-UIDs/GIDs setting.
+  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.

  Example
     remap-user = "containers"
@ -230,20 +193,21 @@ The `storage.options.overlay` table supports the following options:

 **force_mask** = "0000|shared|private"
  ForceMask specifies the permissions mask that is used for new files and
-directories. The values "shared" and "private" are accepted.  (default: ""). Octal permission
+directories.
+The values "shared" and "private" are accepted.  (default: ""). Octal permission
 masks are also accepted.

- ``: Not set
-  All files/directories, get set with the permissions identified within the
+  ``: Not set
+     All files/directories, get set with the permissions identified within the
 image.

- `private`: it is equivalent to 0700.
-  All files/directories get set with 0700 permissions.  The owner has rwx
+  `private`: it is equivalent to 0700.
+     All files/directories get set with 0700 permissions.  The owner has rwx
 access to the files. No other users on the system can access the files.
 This setting could be used with networked based home directories.

- `shared`: it is equivalent to 0755.
-  The owner has rwx access to the files and everyone else can read, access
+  `shared`: it is equivalent to 0755.
+     The owner has rwx access to the files and everyone else can read, access
 and execute them. This setting is useful for sharing containers storage
 with other users.  For instance, a storage owned by root could be shared
 to rootless users as an additional store.
@ -257,7 +221,7 @@ Note: The force_mask Flag is an experimental feature, it could change in the
 future.  When "force_mask" is set the original permission mask is stored in the
 "user.containers.override_stat" xattr and the "mount_program" option must be
 specified. Mount programs like "/usr/bin/fuse-overlayfs" present the extended
-attribute permissions to processes within containers rather than the
+attribute permissions to processes within containers rather then the
 "force_mask"  permissions.

 **mount_program**=""
@ -272,9 +236,6 @@ based file systems.
 **mountopt**=""
  Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.

-**skip_mount_home=""**
-  Tell storage drivers to not create a PRIVATE bind mount on their home directory.
-
 **size**=""
  Maximum size of a read/write layer.   This flag can be used to set quota on the size of a read/write layer of a container. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))

@ -295,6 +256,9 @@ The `storage.options.zfs` table supports the following options:
 **mountopt**=""
  Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.

+**skip_mount_home=""**
+  Tell storage drivers to not create a PRIVATE bind mount on their home directory.
+
 **size**=""
  Maximum size of a container image.   This flag can be used to set quota on the size of container images. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))

@ -353,7 +317,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 storage.conf files. Container
+Note: The storage.conf file overrides all other strorage.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
@ -11,13 +11,6 @@ containers-transports - description of supported transports for copying and stor
 Tools which use the containers/image library, including skopeo(1), buildah(1), podman(1), all share a common syntax for referring to container images in various locations.
 The general form of the syntax is _transport:details_, where details are dependent on the specified transport, which are documented below.

-The semantics of the image names ultimately depend on the environment where
-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.
@ -40,13 +33,10 @@ 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`.
@ -59,7 +49,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.

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

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

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

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

-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.
+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_.

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

-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.
+An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_.

 ### **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
@ -26,18 +26,6 @@
 #
 #apparmor_profile = "container-default"

-# The hosts entries from the base hosts file are added to the containers hosts
-# 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.
-#
-#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.
@ -58,7 +46,7 @@
 # the default capabilities defined in the container engine will be added.
 #
 default_capabilities = [
-  "NET_RAW",
+    "NET_RAW",
  "CHOWN",
  "DAC_OVERRIDE",
  "FOWNER",
@ -69,7 +57,7 @@ default_capabilities = [
  "SETGID",
  "SETPCAP",
  "SETUID",
-  "SYS_CHROOT",
+  "SYS_CHROOT"
 ]

 # A list of sysctls to be set in containers by default,
@ -120,22 +108,13 @@ 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.
 #
 #env_host = false

-# Set the ip for the host.containers.internal entry in the containers /etc/hosts
-# file. This can be set to "none" to disable adding this entry. By default it
-# will automatically choose the host ip.
-#
-# NOTE: When using podman machine this entry will never be added to the containers
-# hosts file instead the gvproxy dns resolver will resolve this hostname. Therefore
-# it is not possible to disable the entry in this case.
-#
-#host_containers_internal_ip = ""
-
 # Default proxy environment variables passed into the container.
 # The environment variables passed in include:
 # http_proxy, https_proxy, ftp_proxy, no_proxy, and the upper case versions of
@ -150,20 +129,15 @@ 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"

 # Default way to to create an IPC namespace (POSIX SysV IPC) for the container
 # Options are:
-#  "host"     Share host IPC Namespace with the container.
-#  "none"     Create shareable IPC Namespace for the container without a private /dev/shm.
-#  "private"  Create private IPC Namespace for the container, other containers are not allowed to share it.
-#  "shareable" Create shareable IPC Namespace for the container.
+# `private` Create private IPC Namespace for the container.
+# `host`    Share host IPC Namespace with the container.
 #
-#ipcns = "shareable"
+#ipcns = "private"

 # keyring tells the container engine whether to create
 # a kernel keyring for use within the container.
@ -176,12 +150,6 @@ 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"
@ -200,13 +168,6 @@ 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.
@ -220,10 +181,6 @@ 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.
@ -242,22 +199,6 @@ 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.
 #
@ -286,6 +227,12 @@ 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.
@ -300,11 +247,6 @@ 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"

@ -334,15 +276,6 @@ 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"
@ -354,27 +287,6 @@ network_backend = "cni"
 #
 #default_subnet = "10.88.0.0/16"

-# DefaultSubnetPools is a list of subnets and size which are used to
-# allocate subnets automatically for podman network create.
-# It will iterate through the list and will pick the first free subnet
-# with the given size. This is only used for ipv4 subnets, ipv6 subnets
-# are always assigned randomly.
-#
-#default_subnet_pools = [
-#  {"base" = "10.89.0.0/16", "size" = 24},
-#  {"base" = "10.90.0.0/15", "size" = 24},
-#  {"base" = "10.92.0.0/14", "size" = 24},
-#  {"base" = "10.96.0.0/11", "size" = 24},
-#  {"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.
@ -383,54 +295,16 @@ network_backend = "cni"
 #
 #network_config_dir = "/etc/cni/net.d/"

-# Port to use for dns forwarding daemon with netavark in rootful bridge
-# mode and dns enabled.
-# Using an alternate port might be useful if other dns services should
-# run on the machine.
-#
-#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"
-
-#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
+#active_service = production

 # 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"
@ -460,20 +334,11 @@ 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
@ -495,25 +360,12 @@ network_backend = "cni"
 # Define where event logs will be stored, when events_logger is "file".
 #events_logfile_path=""

-# Sets the maximum size for events_logfile_path.
-# The size can be b (bytes), k (kilobytes), m (megabytes), or g (gigabytes).
-# The format for the size is `<number><unit>`, e.g., `1b` or `3g`.
-# If no unit is included then the size will be read in bytes.
-# When the limit is exceeded, the logfile will be rotated and the old one will be deleted.
-# If the maximum size is set to 0, then no limit will be applied,
-# and the logfile will not be rotated.
-#events_logfile_max_size = "1m"
-
 # Selects which logging mechanism to use for container engine events.
 # Valid values are `journald`, `file` and `none`.
 #
 #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 = [
@ -544,46 +396,38 @@ events_logger = "file"
 #
 #image_parallel_copies = 0

-# 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 users to create content that disappears when
-#     the container is stopped.
-#   * ignore: All volumes are just ignored and no action is taken.
-#
-#image_volume_mode = ""
-
 # Default command to run the infra container
 #
 #infra_command = "/pause"

 # 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 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
+# 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
 # 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"
+
+# Indicates if Podman is running inside a VM via Podman Machine.
+# Podman uses this value to do extra setup around networking from the
+# container inside the VM to to host.
+#
+#machine_enabled = false

 # 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
@ -599,26 +443,9 @@ events_logger = "file"
 #network_cmd_path = ""

 # Default options to pass to the slirp4netns binary.
-# Valid options values are:
+# For example "allow_host_loopback=true"
 #
-# - allow_host_loopback=true|false: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`).
-#   Default is false.
-# - mtu=MTU: Specify the MTU to use for this network. (Default is `65520`).
-# - cidr=CIDR: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
-# - enable_ipv6=true|false: Enable IPv6. Default is true. (Required for `outbound_addr6`).
-# - outbound_addr=INTERFACE: Specify the outbound interface slirp should bind to (ipv4 traffic only).
-# - outbound_addr=IPv4: Specify the outbound ipv4 address slirp should bind to.
-# - outbound_addr6=INTERFACE: Specify the outbound interface slirp should bind to (ipv6 traffic only).
-# - outbound_addr6=IPv6: Specify the outbound ipv6 address slirp should bind to.
-# - port_handler=rootlesskit: Use rootlesskit for port forwarding. Default.
-#   Note: Rootlesskit changes the source IP address of incoming packets to a IP address in the container
-#   network namespace, usually `10.0.2.100`. If your application requires the real source IP address,
-#   e.g. web server logs, use the slirp4netns port handler. The rootlesskit port handler is also used for
-#   rootless containers when connected to user-defined networks.
-# - port_handler=slirp4netns: Use the slirp4netns port forwarding, it is slower than rootlesskit but
-#   preserves the correct source IP address. This port handler cannot be used for user-defined networks.
-#
-#network_cmd_options = []
+#network_cmd_options = ["enable_ipv6=true",]

 # Whether to use chroot instead of pivot_root in the runtime
 #
@ -630,9 +457,6 @@ events_logger = "file"
 #
 #num_locks = 2048

-# Set the exit policy of the pod when the last container exits.
-#pod_exit_policy = "continue"
-
 # Whether to pull new image before running a container
 #
 #pull_policy = "missing"
@ -651,7 +475,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", "youki", "krun"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"]

 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
@ -682,21 +506,16 @@ runtime = "runc"
 #
 #stop_timeout = 10

-# Number of seconds to wait before exit command in API process is given to.
-# This mimics Docker's exec cleanup behaviour, where the default is 5 minutes (value is in seconds).
-#
-#exit_command_delay = 300
-
 # map of service destinations
 #
-# [engine.service_destinations]
-#  [engine.service_destinations.production]
+#[service_destinations]
+#  [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)
+#       rootfull "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
+#       remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
 #
 #    uri = "ssh://user@production.example.com/run/user/1001/podman/podman.sock"
 #    Path to file containing ssh identity key
@ -713,15 +532,6 @@ runtime = "runc"
 #
 #volume_path = "/var/lib/containers/storage/volumes"

-# Default timeout (in seconds) for volume plugin operations.
-# Plugins are external programs accessed via a REST API; this sets a timeout
-# for requests to that API.
-# 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 = [
@ -765,13 +575,6 @@ 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",
@ -789,14 +592,7 @@ runtime = "runc"
 #
 #disk_size=10

-# Default image URI when creating a new VM using `podman machine init`.
-# Options: On Linux/Mac, `testing`, `stable`, `next`. On Windows, the major
-# version of the OS (e.g `36`) for Fedora 36. For all platforms you can
-# alternatively specify a custom download URL to an image. Container engines
-# translate URIs $OS and $ARCH to the native OS and ARCH. URI
-# "https://example.com/$OS/$ARCH/foobar.ami" becomes
-# "https://example.com/linux/amd64/foobar.ami" on a Linux AMD machine.
-# The default value is `testing`.
+# The image used when creating a podman-machine VM.
 #
 #image = "testing"

@ -809,30 +605,8 @@ runtime = "runc"
 #
 #user = "core"

-# Host directories to be mounted as volumes into the VM by default.
-# 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.
-#
-#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,12 +9,11 @@ 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__,
-__/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 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.

 Fields specified in containers conf override the default options, as well as
 options in previously read containers.conf files.
@ -23,47 +22,13 @@ 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 registries to search while pulling.
+* `registries.conf` for definition of container registires 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
@ -85,7 +50,6 @@ 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"
@ -95,19 +59,6 @@ Example: "run.oci.keep_original_groups=1"
 Used to change the name of the default AppArmor profile of container engines.
 The default profile name is "container-default".

-**base_hosts_file**=""
-
-The hosts entries from the base hosts file are added to the containers hosts
-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.
@ -130,13 +81,15 @@ List of default capabilities for containers.
 The default list is:
 ```
 default_capabilities = [
+"AUDIT_WRITE",
      "CHOWN",
      "DAC_OVERRIDE",
      "FOWNER",
      "FSETID",
      "KILL",
+      "MKNOD",
      "NET_BIND_SERVICE",
-      "SETFCAP",
+      "NET_RAW",
      "SETGID",
      "SETPCAP",
      "SETUID",
@ -144,10 +97,6 @@ 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,
@ -185,7 +134,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"]
+**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "TERM=xterm"]

 Environment variable list for the container process, used for passing
 environment variables to the container.
@ -194,16 +143,6 @@ environment variables to the container.

 Pass all host environment variables into the container.

-**host_containers_internal_ip**=""
-
-Set the ip for the host.containers.internal entry in the containers /etc/hosts
-file. This can be set to "none" to disable adding this entry. By default it
-will automatically choose the host ip.
-
-NOTE: When using podman machine this entry will never be added to the containers
-hosts file instead the gvproxy dns resolver will resolve this hostname. Therefore
-it is not possible to disable the entry in this case.
-
 **http_proxy**=true

 Default proxy environment variables will be passed into the container.
@ -219,22 +158,16 @@ 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.

-**ipcns**="shareable"
+**ipcns**="private"

 Default way to to create a IPC namespace for the container.
 Options are:
-  `host`     Share host IPC Namespace with the container.
-  `none`     Create shareable IPC Namespace for the container without a private /dev/shm.
-  `private`  Create private IPC Namespace for the container, other containers are not allowed to share it.
-  `shareable` Create shareable IPC Namespace for the container.
+  `private` Create private IPC Namespace for the container.
+  `host`    Share host IPC Namespace with the container.

 **keyring**=true

@ -245,16 +178,9 @@ the container.

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

-**label_users**=false
+**log_driver**="k8s-file"

-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.
+Logging driver for the container. Available options: `k8s-file` and `journald`.

 **log_size_max**=-1

@ -267,13 +193,6 @@ 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.
@ -287,10 +206,6 @@ 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.
@ -307,16 +222,6 @@ 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
@ -351,6 +256,11 @@ 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.
@ -358,12 +268,6 @@ Options are:
  `private` Create private UTS Namespace for the container.
  `host`    Share host UTS Namespace with the container.

-**volumes**=[]
-
-List of volumes.
-Specified as "directory-on-host:directory-in-container:options".
-
-Example:  "/db:/var/lib/db:ro".

 ## NETWORK TABLE
 The `network` table contains settings pertaining to the management of CNI
@ -394,20 +298,6 @@ 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.
@ -417,49 +307,20 @@ The network name of the default network to attach pods to.
 The subnet to use for the default network (named above in **default_network**).
 If the default network does not exist, it will be automatically created the first time a tool is run using this subnet.

-**default_subnet_pools**=[]
-
-DefaultSubnetPools is a list of subnets and size which are used to
-allocate subnets automatically for podman network create.
-It will iterate through the list and will pick the first free subnet
-with the given size. This is only used for ipv4 subnets, ipv6 subnets
-are always assigned randomly.
-
-The default list is (10.89.0.0-10.255.255.0/24):
-```
-default_subnet_pools = [
-  {"base" = "10.89.0.0/16", "size" = 24},
-  {"base" = "10.90.0.0/15", "size" = 24},
-  {"base" = "10.92.0.0/14", "size" = 24},
-  {"base" = "10.96.0.0/11", "size" = 24},
-  {"base" = "10.128.0.0/9", "size" = 24},
-]
-```
-
-**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.

-**dns_bind_port**=53
+**volumes**=[]

-Port to use for dns forwarding daemon with netavark in rootful bridge
-mode and dns enabled.
-Using an alternate port might be useful if other dns services should
-run on the machine.
+List of volumes.
+Specified as "directory-on-host:directory-in-container:options".

-**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.
+Example:  "/db:/var/lib/db:ro".

 ## ENGINE TABLE
 The `engine` table contains configuration options used to set up container engines such as Podman and Buildah.
@ -468,39 +329,11 @@ 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.
@ -525,15 +358,6 @@ 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.
@ -541,7 +365,6 @@ 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

@ -562,57 +385,22 @@ if you want to set environment variables for the container.

 Define where event logs will be stored, when events_logger is "file".

-**events_logfile_max_size**="1m"
-
-Sets the maximum size for events_logfile_path.
-The unit can be b (bytes), k (kilobytes), m (megabytes) or g (gigabytes).
-The format for the size is `<number><unit>`, e.g., `1b` or `3g`.
-If no unit is included then the size will be in bytes.
-When the limit is exceeded, the logfile will be rotated and the old one will be deleted.
-If the maximumn size is set to 0, then no limit will be applied,
-and the logfile will not be rotated.
-
 **events_logger**="journald"

-The default method to use when logging events.
-
-The default method is different based on the platform that
-Podman is being run upon.  To determine the current value,
-use this command:
-
-`podman info --format {{.Host.EventLogger}`
-
-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.
+Default method to use when logging events.
+Valid values: `file`, `journald`, and `none`.

 **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`
@ -623,7 +411,6 @@ 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", ...]
@ -646,34 +433,22 @@ Default transport method for pulling and pushing images.
 Maximum number of image layers to be copied (pulled/pushed) simultaneously.
 Not setting this field will fall back to containers/image defaults. (6)

-**image_volume_mode**="bind"
-
-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.
-* ignore: All volumes are just ignored and no action is taken.
-
 **infra_command**="/pause"

 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 than sleep,
-reserving the pod's resources for the lifetime of the pod.
+associated with the pod. This container does nothing other then sleep,
+reserving the pods 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 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
+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
 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".
@ -682,6 +457,12 @@ Change the default only if you are sure of what you are doing, in general
 faster "shm" lock type. You may need to run "podman system renumber" after you
 change the lock type.

+**machine_enabled**=false
+
+Indicates if Podman is running inside a VM via Podman Machine.
+Podman uses this value to do extra setup around networking from the
+container inside the VM to to host.
+
 **multi_image_archive**=false

 Allows for creating archives (e.g., tarballs) with more than one image. Some container engines, such as Podman, interpret additional arguments as tags for one image and hence do not store more than one image. The default behavior can be altered with this option.
@ -698,16 +479,16 @@ and pods are visible.

 Path to the slirp4netns binary.

-**network_cmd_options**=[]
+**network_cmd_options**=["enable_ipv6=true",]

 Default options to pass to the slirp4netns binary.

 Valid options values are:

-  - **allow_host_loopback=true|false**: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`). Default is false.
+  - **allow_host_loopback=true|false**: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`, which is added to `/etc/hosts` as `host.containers.internal` for your convenience). Default is false.
  - **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
  - **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
-  - **enable_ipv6=true|false**: Enable IPv6. Default is true. (Required for `outbound_addr6`).
+  - **enable_ipv6=true|false**: Enable IPv6. Default is false. (Required for `outbound_addr6`).
  - **outbound_addr=INTERFACE**: Specify the outbound interface slirp should bind to (ipv4 traffic only).
  - **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp should bind to.
  - **outbound_addr6=INTERFACE**: Specify the outbound interface slirp should bind to (ipv6 traffic only).
@ -727,15 +508,6 @@ pod consumes one lock. The default number available is 2048. If this is
 changed, a lock renumbering must be performed, using the
 `podman system renumber` command.

-**pod_exit_policy**="continue"
-
-Set the exit policy of the pod when the last container exits.  Supported policies are:
-
-| Exit Policy        | Description                                                                 |
-| ------------------ | --------------------------------------------------------------------------- |
-| *continue*         | The pod continues running when the last container exits. Used by default.   |
-| *stop*             | The pod is stopped when the last container exits. Used in `play kube`.      |
-
 **pull_policy**="always"|"missing"|"never"

 Pull image before running or creating a container. The default is **missing**.
@ -745,7 +517,6 @@ 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.

@ -755,7 +526,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", "youki", "krun"]
+**runtime_supports_json**=["crun", "runc", "kata", "runsc", "krun"]

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

@ -790,10 +561,6 @@ stores containers.

 Number of seconds to wait for container to exit before sending kill signal.

-**exit_command_delay**=300
-
-Number of seconds to wait for the API process for the exec call before sending exit command mimicking the Docker behavior of 5 minutes (in seconds).
-
 **tmp_dir**="/run/libpod"

 The path to a temporary directory to store per-boot container.
@ -812,34 +579,23 @@ 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**="gzip"
+**compression_format**=""

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

-**compression_level**="5"
-
-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.
+The `service_destinations` table contains configuration options used to set up remote connections to the podman service for the podman API.

-**[engine.service_destinations.{name}]**
+**[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 remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock
+- **rootfull local**  - unix://run/podman/podman.sock
+- **rootfull remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock

 **identity="~/.ssh/id_rsa**

@ -852,10 +608,6 @@ 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.
@ -883,13 +635,11 @@ The size of the disk in GB created when init-ing a podman-machine VM

 **image**=""

-Default image URI when creating a new VM using `podman machine init`.
+Default image used when creating a new VM using `podman machine init`.
 Options: On Linux/Mac, `testing`, `stable`, `next`. On Windows, the major
-version of the OS (e.g `36`) for Fedora 36. For all platforms you can
-alternatively specify a custom download URL to an image. Container engines
-translate URIs $OS and $ARCH to the native OS and ARCH. URI "https://example.com/$OS/$ARCH/foobar.ami" would become "https://example.com/linux/amd64/foobar.ami" on a Linux AMD machine.
-The default value
-is `testing` on Linux/Mac, and on Windows.
+version of the OS (e.g `35`). For all platforms you can alternatively specify
+a custom path or download URL to an image. The default is `testing` on
+Linux/Mac, and `35` on Windows.

 **memory**=2048

@ -900,54 +650,27 @@ Memory in MB a machine is created with.
 Username to use and create on the podman machine OS for rootless container
 access. The default value is `user`. On Linux/Mac the default is`core`.

-**volumes**=["$HOME:$HOME"]
-
-Host directories to be mounted as volumes into the VM by default.
-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
-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__.
+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.

-Fields specified in a containers.conf file override the default options, as
-well as options in previously loaded containers.conf files.
+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.

 **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/default-policy.json
+++ b/SOURCES/default-policy.json
@ -10,14 +10,14 @@
 		{
 		    "type": "signedBy",
 		    "keyType": "GPGKeys",
-		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
+		    "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
 		}
 	    ],
 	    "registry.redhat.io": [
 		{
 		    "type": "signedBy",
 		    "keyType": "GPGKeys",
-		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
+		    "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
 		}
 	    ]
 	},
--- a/SOURCES/pyxis.sh
+++ b/SOURCES/pyxis.sh
@ -1,47 +1,63 @@
 #!/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/250))
+PAGES=$(($TOTAL/500))
 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
-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
+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
    if [[ $REGISTRY == *quay.io* ]] ||
       [[ $REGISTRY == *redhat.com* ]]; then
-      if [ "$REQ_TERMS" == "true" ]; then
+      if [ "$REQUIRES_TERMS" == "1" ]; then
        REGISTRY=registry.redhat.io
      fi
+      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
+      echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
    fi
-    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
-    echo $PUBLISHED,$REQ_TERMS,$REPOSITORY,$REGISTRY,$RELEASE >> /tmp/pyx_debug
-    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
+    REGISTRY=""
+    PUBLISHED=""
+    AVAILABLE=""
+    REPOSITORY=""
+    REQUIRES_TERMS=""
+    continue
  fi
-  IDX=$(($IDX+5))
-done
+  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

 cp /tmp/rhel-shortnames.conf /tmp/r.conf
 for D in `cut -d\  -f1 /tmp/r.conf | sort | uniq -d`; do
--- a/SOURCES/seccomp.json
+++ b/SOURCES/seccomp.json
@ -176,7 +176,6 @@
 				"futex",
 				"futex_time64",
 				"futimesat",
-				"get_mempolicy",
 				"get_robust_list",
 				"get_thread_area",
 				"getcpu",
@ -192,6 +191,7 @@
 				"getgroups",
 				"getgroups32",
 				"getitimer",
+				"get_mempolicy",
 				"getpeername",
 				"getpgid",
 				"getpgrp",
@ -228,9 +228,6 @@
 				"ipc",
 				"keyctl",
 				"kill",
-				"landlock_add_rule",
-				"landlock_create_ruleset",
-				"landlock_restrict_self",
 				"lchown",
 				"lchown32",
 				"lgetxattr",
@ -246,7 +243,6 @@
 				"lstat64",
 				"madvise",
 				"mbind",
-				"membarrier",
 				"memfd_create",
 				"memfd_secret",
 				"mincore",
@ -260,7 +256,6 @@
 				"mmap",
 				"mmap2",
 				"mount",
-				"mount_setattr",
 				"move_mount",
 				"mprotect",
 				"mq_getsetattr",
@ -284,9 +279,9 @@
 				"nanosleep",
 				"newfstatat",
 				"open",
-				"open_tree",
 				"openat",
 				"openat2",
+				"open_tree",
 				"pause",
 				"pidfd_getfd",
 				"pidfd_open",
@ -305,12 +300,8 @@
 				"preadv",
 				"preadv2",
 				"prlimit64",
-				"process_mrelease",
-				"process_vm_readv",
-				"process_vm_writev",
 				"pselect6",
 				"pselect6_time64",
-				"ptrace",
 				"pwrite64",
 				"pwritev",
 				"pwritev2",
@ -369,6 +360,7 @@
 				"sendmmsg",
 				"sendmsg",
 				"sendto",
+				"setns",
 				"set_mempolicy",
 				"set_robust_list",
 				"set_thread_area",
@ -382,7 +374,6 @@
 				"setgroups",
 				"setgroups32",
 				"setitimer",
-				"setns",
 				"setpgid",
 				"setpriority",
 				"setregid",
@ -404,15 +395,10 @@
 				"shmdt",
 				"shmget",
 				"shutdown",
-				"sigaction",
 				"sigaltstack",
-				"signal",
 				"signalfd",
 				"signalfd4",
-				"sigpending",
-				"sigprocmask",
 				"sigreturn",
-				"sigsuspend",
 				"socket",
 				"socketcall",
 				"socketpair",
@ -427,7 +413,6 @@
 				"sync",
 				"sync_file_range",
 				"syncfs",
-				"syscall",
 				"sysinfo",
 				"syslog",
 				"tee",
@ -440,7 +425,6 @@
 				"timer_gettime64",
 				"timer_settime",
 				"timer_settime64",
-				"timerfd",
 				"timerfd_create",
 				"timerfd_gettime",
 				"timerfd_gettime64",
@ -578,10 +562,10 @@
 			"names": [
 				"arm_fadvise64_64",
 				"arm_sync_file_range",
+				"sync_file_range2",
 				"breakpoint",
 				"cacheflush",
-				"set_tls",
-				"sync_file_range2"
+				"set_tls"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
@ -749,8 +733,8 @@
 		{
 			"names": [
 				"delete_module",
-				"finit_module",
 				"init_module",
+				"finit_module",
 				"query_module"
 			],
 			"action": "SCMP_ACT_ALLOW",
@ -766,8 +750,8 @@
 		{
 			"names": [
 				"delete_module",
-				"finit_module",
 				"init_module",
+				"finit_module",
 				"query_module"
 			],
 			"action": "SCMP_ACT_ERRNO",
@ -815,7 +799,10 @@
 		{
 			"names": [
 				"kcmp",
-				"process_madvise"
+				"process_madvise",
+				"process_vm_readv",
+				"process_vm_writev",
+				"ptrace"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
@ -830,7 +817,10 @@
 		{
 			"names": [
 				"kcmp",
-				"process_madvise"
+				"process_madvise",
+				"process_vm_readv",
+				"process_vm_writev",
+				"ptrace"
 			],
 			"action": "SCMP_ACT_ERRNO",
 			"args": [],
@ -846,8 +836,8 @@
 		},
 		{
 			"names": [
-				"ioperm",
-				"iopl"
+				"iopl",
+				"ioperm"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
@ -861,8 +851,8 @@
 		},
 		{
 			"names": [
-				"ioperm",
-				"iopl"
+				"iopl",
+				"ioperm"
 			],
 			"action": "SCMP_ACT_ERRNO",
 			"args": [],
@ -878,10 +868,10 @@
 		},
 		{
 			"names": [
-				"clock_settime",
-				"clock_settime64",
 				"settimeofday",
-				"stime"
+				"stime",
+				"clock_settime",
+				"clock_settime64"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
@ -895,10 +885,10 @@
 		},
 		{
 			"names": [
-				"clock_settime",
-				"clock_settime64",
 				"settimeofday",
-				"stime"
+				"stime",
+				"clock_settime",
+				"clock_settime64"
 			],
 			"action": "SCMP_ACT_ERRNO",
 			"args": [],
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@ -2,10 +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"
+  "archlinux" = "docker.io/archlinux/archlinux"
  # centos
  "centos" = "quay.io/centos/centos"
  # containers
@ -22,8 +20,6 @@
  # 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"
@ -46,20 +42,16 @@
  "sles12sp5" = "registry.suse.com/suse/sles12sp5"
  "sles12sp4" = "registry.suse.com/suse/sles12sp4"
  "sles12sp3" = "registry.suse.com/suse/sles12sp3"
-  "bci/bci-base" = "registry.suse.com/bci/bci-base"
-  "bci/bci-micro" = "registry.suse.com/bci/bci-micro"
-  "bci/bci-minimal" = "registry.suse.com/bci/bci-minimal"
-  "bci/bci-busybox" = "registry.suse.com/bci/bci-busybox"
  # Red Hat Enterprise Linux
  "rhel" = "registry.access.redhat.com/rhel"
  "rhel6" = "registry.access.redhat.com/rhel6"
  "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-minimal"
+  "rhel-minimal" = "registry.access.redhat.com/rhel-minimum"
  "rhel-init" = "registry.access.redhat.com/rhel-init"
  "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
-  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimal"
+  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimum"
  "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,16 +111,5 @@
  "php" = "docker.io/library/php"
  # python
  "python" = "docker.io/library/python"
-  # rust
-  "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
@ -1,4 +1,4 @@
-# This file is the configuration file for all tools
+# This file is is the configuration file for all tools
 # that use the containers/storage library. The storage.conf file
 # overrides all other storage.conf files. Container engines using the
 # container/storage library do not inherit fields from other storage.conf
@ -27,21 +27,11 @@ 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

@ -50,28 +40,6 @@ graphroot = "/var/lib/containers/storage"
 additionalimagestores = [
 ]

-# Allows specification of how storage is populated when pulling images. This
-# option can speed the pulling process of images compressed with format
-# zstd:chunked. Containers/storage looks for files within images that are being
-# pulled from a container registry that were previously pulled to the host.  It
-# can copy or create a hard link to the existing file when it finds them,
-# eliminating the need to pull them from the 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 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.
-#   * use_hard_links = "false" | "true"
-#     Tells containers/storage to use hard links rather then create new files in
-#     the image, if an identical file already existed in storage.
-#   * ostree_repos = ""
-#     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
-pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
-
 # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
 # a container, to the UIDs/GIDs as they should appear outside of the container,
 # and the length of the range of UIDs/GIDs.  Additional mapped sets can be
@ -79,8 +47,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
@ -88,8 +56,7 @@ 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. This setting overrides the
-# Remap-UIDs/GIDs setting.
+# until all of the entries have been used for maps.
 #
 # remap-user = "containers"
 # remap-group = "containers"
@ -105,7 +72,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 maximum size for a user namespace created automatically.
+# Auto-userns-max-size is the minimum size for a user namespace created automatically.
 # auto-userns-max-size=65536

 [storage.options.overlay]
@ -161,7 +128,7 @@ mountopt = "nodev,metacopy=on"
 #  future.  When "force_mask" is set the original permission mask is stored in
 #  the "user.containers.override_stat" xattr and the "mount_program" option must
 #  be specified. Mount programs like "/usr/bin/fuse-overlayfs" present the
-#  extended attribute permissions to processes within containers rather than the
+#  extended attribute permissions to processes within containers rather then the
 #  "force_mask"  permissions.
 #
 # force_mask = ""
--- a/SOURCES/update-vendored.sh
+++ b/SOURCES/update-vendored.sh
@ -7,27 +7,23 @@ 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
-  $PKG switch-branch $BRN
+  [ -z "$CENTOS" ] && 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
-  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
+  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
  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,47 +21,27 @@ $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\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf log_driver                    \"k8s-file\"
 ensure containers.conf network_backend               \"cni\"
-if ! grep \"NET_RAW\" containers.conf > /dev/null
-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
-[ `grep \"socket\", seccomp.json | wc -l` == 0 ] && sed -i '/\"socketcall\",/i \
+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
+if ! grep \"NET_RAW\" containers.conf > /dev/null
+then
+  sed -i '/^default_capabilities/a \
+    "NET_RAW",' containers.conf
+fi
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@ -4,20 +4,17 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global image_branch v5.29.2
-%global common_branch v0.57.3
-%global storage_branch v1.51.0
+%global image_branch v5.19.1
+%global common_branch v0.47.4
+%global storage_branch v1.38.2
 %global shortnames_branch main

 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 81%{?dist}
+Release: 36%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
-# arch limitation because of go-md2man (missing on i686)
-# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
-ExclusiveArch: %{go_arches}
 BuildRequires: /usr/bin/go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
 Conflicts: %{name} <= 2:1-22
@ -62,13 +59,34 @@ Source25: https://raw.githubusercontent.com/containers/skopeo/%{skopeo_branch}/d
 # FIXME: fix the branch once these are available via regular c/common branch
 Source26: https://raw.githubusercontent.com/containers/common/main/docs/Containerfile.5.md
 Source27: https://raw.githubusercontent.com/containers/common/main/docs/containerignore.5.md
-Source28: RPM-GPG-KEY-redhat-beta

 # scripts used for synchronization with upstream and shortname generation
 Source100: update.sh
 Source101: update-vendored.sh
 Source102: pyxis.sh

+%global aardvark_dns_version v1.0.3
+#%%global aardvark_dns_branch v1.0.1-rhel
+%global aardvark_dns_commit0 a92337b08fbd88c9eb10c1a5ebce2bf61aa59a7b
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+%if 0%{?aardvark_dns_branch:1}
+Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%else
+Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
+%endif
+Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
+
+%global netavark_version v1.0.3
+#%%global netavark_branch v1.0.1-rhel
+%global netavark_commit0 ec7efb85ef90db4a14c07cb003b65491f7eb4edf
+%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
+%if 0%{?netavark_branch:1}
+Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
+%else
+Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
+%endif
+Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
+
 %description
 This package contains common configuration files and documentation for container
 tools ecosystem, such as Podman, Buildah and Skopeo.
@ -77,13 +95,118 @@ It is required because the most of configuration files and docs come from projec
 which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged
 separately.

+%package -n aardvark-dns
+Version: 1.0.1
+Release: 36%{?dist}
+URL: https://github.com/containers/aardvark-dns
+Summary: Authoritative DNS server for A/AAAA container records
+License: ASL 2.0 and BSD and MIT
+BuildRequires: cargo
+BuildRequires: git-core
+BuildRequires: make
+BuildRequires: rust-srpm-macros
+BuildRequires: rust-toolset
+#ExclusiveArch: %%{rust_arches}
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+
+%description -n aardvark-dns
+%{summary}
+
+Forwards other request to configured resolvers.
+Read more about configuration in `src/backend/mod.rs`.
+
+%package -n netavark
+Version: 1.0.1
+Release: 36%{?dist}
+URL: https://github.com/containers/netavark
+Summary: OCI network stack
+License: ASL 2.0 and BSD and MIT
+BuildRequires: cargo
+BuildRequires: make
+BuildRequires: rust-srpm-macros
+BuildRequires: git-core
+BuildRequires: /usr/bin/go-md2man
+Recommends: aardvark-dns
+Provides: container-network-stack = 2
+BuildRequires: rust-toolset
+#ExclusiveArch: #%%{rust_arches}
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+
+%description -n netavark
+%{summary}
+
+Netavark is a rust based network stack for containers. It is being
+designed to work with Podman but is also applicable for other OCI
+container management applications.
+
+Netavark is a tool for configuring networking for Linux containers.
+Its features include:
+* Configuration of container networks via JSON configuration file
+* Creation and management of required network interfaces,
+    including MACVLAN networks
+* All required firewall configuration to perform NAT and port
+    forwarding as required for containers
+* Support for iptables and firewalld at present, with support
+    for nftables planned in a future release
+* Support for rootless containers
+* Support for IPv4 and IPv6
+* Support for container DNS resolution via aardvark-dns.
+
 %prep
+tar fx %{SOURCE200}
+pushd aardvark-dns-%{aardvark_dns_commit0}
+tar fx %{SOURCE201}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
+popd
+tar fx %{SOURCE300}
+pushd netavark-%{netavark_commit0}
+tar fx %{SOURCE301}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
+popd

 %build
+%if 0%{?build_rustflags:1}
+export RUSTFLAGS="%{build_rustflags}"
+%endif
+
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%__scm_setup_git -q
+%make_build build
+popd
+
+pushd netavark-%{netavark_commit0}
+%__scm_setup_git -q
+%make_build build
+pushd docs
+go-md2man -in netavark.1.md -out netavark.1
+popd
+%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+popd

 %install
-install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,systemd,registries.d,registries.conf.d}
-install -dp %{buildroot}%{_datadir}/containers/systemd
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+popd
+
+pushd netavark-%{netavark_commit0}
+%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+popd
+
+install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.d,registries.conf.d}
 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
@ -94,7 +217,6 @@ install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf
 %if !0%{?rhel} || 0%{?centos}
 install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -m0644 %{SOURCE28} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 %endif
 install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
 install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d
@ -148,22 +270,20 @@ EOF
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/certs.d
 %dir %{_sysconfdir}/containers/registries.d
+%{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
+%{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
 %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
 %endif
 %config(noreplace) %{_sysconfdir}/containers/policy.json
+%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/*.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
-%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
-%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
+%config(noreplace) %{_sysconfdir}/containers/registries.d/*.yaml
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
 %{_mandir}/man5/*
@ -174,161 +294,40 @@ EOF
 %dir %{_datadir}/rhel/secrets
 %{_datadir}/rhel/secrets/*

+%files -n aardvark-dns
+%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/aardvark-dns
+
+%files -n netavark
+%license netavark-%{netavark_commit0}/LICENSE
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/netavark
+%{_mandir}/man1/netavark.1*
+
 %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
+* Tue Oct 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
 - update vendored components and configuration files
- Related: #2123641
+- Related: #2129766

-* Fri Dec 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-48
- update vendored components and configuration files
- Related: #2123641
-
-* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-47
- enable NET_RAW capability for RHEL8 only
- Related: #2123641
-
-* Tue Nov 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-46
- update vendored components and configuration files
- Related: #2123641
-
-* Fri Oct 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-45
- update vendored components and configuration files
- Related: #2123641
-
-* Mon Oct 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-44
- update vendored components and configuration files
- Related: #2123641
-
-* Thu Oct 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-43
- update vendored components and configuration files
- Related: #2123641
-
-* Wed Sep 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-42
- update vendored components and configuration files
- Related: #2123641
-
-* Tue Sep 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-41
- add beta GPG key
- Related: #2123641
-
-* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
- add beta keys to default-policy.json
- Related: #2061390
-
-* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
- update shortnames
- Related: #2061390
-
-* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
- arch limitation because of go-md2man (missing on i686)
- Related: #2061390
-
-* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
- add install section
- update vendored components
- Related: #2061390
-
-* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
- remove aardvark-dns and netavark - packaged separately
- update vendored components and configuration files
- Related: #2061390
-
-* Tue Jul 26 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
+* Wed Jul 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
 - update vendored components and configuration files
 - Related: #2061390

 * Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
- remove rhel-els and update shortnames
+- update shortnames and be sure to remove rhel-els
 - Related: #2061390

-* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
- update shortnames
- Related: #2061390
-
-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
 - additional fix for unqualified registries
 - Related: #2061390

-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-31
- fix unqualified registries
- Related: #2061390
-
-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-30
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
 - update vendored components and configuration files
 - Related: #2061390

-* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-29
- update unqualified registries list
- Related: #2061390
-
-* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
- update aardvark-dns and netavark to 1.0.3
- update vendored components
- Related: #2061390
-
-* Fri Apr 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-27
- add man page sources too
- Related: #2061390
-
-* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
- add missing man pages from Fedora
- Related: #2061390
-
-* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-25
- allow consuming aardvark-dns and netavark from upstream branch
- Related: #2061390
-
-* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
- update to netavark and aardvark-dns 1.0.2
- update vendored components
+* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-25
+- update vendored components and configuration files
 - Related: #2061390

 * Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
@ -337,71 +336,64 @@ EOF

 * Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-22
 - build rust packages with RUSTFLAGS set to make ExecShield happy
+- bump release tag by 3 for easier cherry-picking from rhel8 stream
 - Related: #2001445

-* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-21
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-19
 - do not specify infra_image in containers.conf
 - needed to resolve gating test failures
 - Related: #2001445

-* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-20
+* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
 - update to netavark-1.0.0 and aardvark-dns-1.0.0
 - Related: #2001445

-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
- package aarvark-dns and netavark as part of the containers-common
- Related: #2001445
-
-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
- update shortnames and vendored components
- Related: #2001445
-
-* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
- containers.conf should contain network_backend = "cni" in RHEL8.6
- Related: #2001445
-
-* Fri Feb 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-16
+* Thu Feb 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
 - update vendored components and configuration files
 - Related: #2001445

-* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
+* Thu Feb 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-16
 - sync vendored components
 - Related: #2001445

+* Thu Feb 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
+- update vendored components and configuration files
+- Related: #2001445
+
 * Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-14
 - sync vendored components
 - Related: #2001445

-* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-13
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-13
+- sync vendored components
+- Related: #2001445
+
+* Fri Jan 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-12
 - update shortnames from Pyxis
 - Related: #2001445

-* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
+* Fri Dec 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
 - do not allow broken content from Pyxis to land in shortnames.conf
 - Related: #2001445

-* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
+* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
 - sync vendored components
 - update shortnames from Pyxis
 - Related: #2001445

-* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
+* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
 - use log_driver = "journald" and events_logger = "journald" for RHEL9
 - Related: #2001445

-* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
+* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-8
 - consume seccomp.json from the oldest vendored version of c/common,
  not main branch
 - Related: #2001445

-* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-8
+* Mon Nov 15 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
 - update vendored components
 - Related: #2001445

-* Tue Nov 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
- make log_driver = "k8s-file" default in containers.conf
- Related: #2001445
-
 * Wed Oct 13 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-6
 - sync vendored components
 - Related: #2001445