SOURCES/Containerfile.5.md

@@ -9,7 +9,7 @@ Containerfile(Dockerfile) - automate the steps of creating a container image
 The **Containerfile** is a configuration file that automates the steps of creating a container image. It is similar to a Makefile. Container engines (Podman, Buildah, Docker) read instructions from the **Containerfile** to automate the steps otherwise performed manually to create an image. To build an image, create a file called **Containerfile**.
 
 The **Containerfile** describes the steps taken to assemble the image. When the
-**Containerfile** has been created, call the `buildah bud`, `podman build`, `docker build` command,
+**Containerfile** has been created, call the `buildah build`, `podman build`, `docker build` command,
 using the path of context directory that contains **Containerfile** as the argument. Podman and Buildah default to **Containerfile** and will fall back to **Dockerfile**. Docker only will search for **Dockerfile** in the context directory.
 
 
@@ -31,7 +31,7 @@ A Containerfile is similar to a Makefile.
 # USAGE
 
   ```
-  buildah bud .
+  buildah build .
   podman build .
   ```
 
@@ -40,7 +40,7 @@ A Containerfile is similar to a Makefile.
   build.
 
   ```
-  buildah bud -t repository/tag .
+  buildah build -t repository/tag .
   podman build -t repository/tag .
   ```
 
@@ -61,7 +61,7 @@ A Containerfile is similar to a Makefile.
   `FROM image@digest [AS <name>]`
 
   -- The **FROM** instruction sets the base image for subsequent instructions. A
-  valid Containerfile must have either **ARG** or *FROM** as its first instruction.
+  valid Containerfile must have either **ARG** or **FROM** as its first instruction.
   If **FROM** is not the first instruction in the file, it may only be preceded by
   one or more ARG instructions, which declare arguments that are used in the next FROM line in the Containerfile.
   The image can be any valid image. It is easy to start by pulling an image from the public
@@ -82,7 +82,7 @@ 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. 
+  -- 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**
@@ -109,7 +109,7 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.
 
        e.g.
 
-       mount=type=bind,source=/path/on/host,destination=/path/in/container
+       mount=type=bind,source=/path/on/host,destination=/path/in/container,relabel=shared
 
        mount=type=tmpfs,tmpfs-size=512M,destination=/path/in/container
 
@@ -117,45 +117,57 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.
 
        Common Options:
 
-              · src, source: mount source spec for bind and volume. Mandatory for bind. If `from` is specified, `src` is the subpath in the `from` field.
+	      · src, source: mount source spec for bind and volume. Mandatory for bind. If `from` is specified, `src` is the subpath in the `from` field.
 
-              · dst, destination, target: mount destination spec.
+	      · dst, destination, target: mount destination spec.
 
-              · ro, read-only: true (default) or false.
+	      · ro, read-only: true (default) or false.
 
        Options specific to bind:
 
-              · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
+	      · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
 
-              . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
+	      . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
 
-              · from: stage or image name for the root of the source. Defaults to the build context.
+	      · from: stage or image name for the root of the source. Defaults to the build context.
 
-              · rw, read-write: allows writes on the mount.
+	      · relabel=shared, z: Relabels src content with a shared label.
+
+	      . relabel=private, Z: Relabels src content with a private label.
+
+	      Labeling systems like SELinux require proper labels on the bind mounted content mounted into a container. Without a label, the security system might prevent the processes running in side the container from using the content. By default, container engines do not change the labels set by the OS. The relabel flag tells the engine to relabel file objects on the shared mountz.
+
+	      The relabel=shared and z options tell the engine that two or more containers will share the mount content. The engine labels the content with a shared content label.
+
+	      The relabel=private and Z options tell the engine to label the content with a private unshared label. Only the current container can use a private mount.
+
+	      Relabeling walks the file system under the mount and changes the label on each file, if the mount has thousands of inodes, this process takes a long time, delaying the start of the container.
+
+	      · 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.
+	      · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
 
-              · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.
+	      · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.
 
-              · tmpcopyup: Path that is shadowed by the tmpfs mount is recursively copied up to the tmpfs itself.
+	      · tmpcopyup: Path that is shadowed by the tmpfs mount is recursively copied up to the tmpfs itself.
 
 	Options specific to cache:
 
-              · id: Create a separate cache directory for a particular id.
+	      · id: Create a separate cache directory for a particular id.
 
-              · mode: File mode for new cache directory in octal. Default 0755.
+	      · mode: File mode for new cache directory in octal. Default 0755.
 
-              · ro, readonly: read only cache if set.
+	      · ro, readonly: read only cache if set.
 
-              · uid: uid for cache directory.
+	      · uid: uid for cache directory.
 
-              · gid: gid for cache directory.
+	      · gid: gid for cache directory.
 
-              · from: stage name for the root of the source. Defaults to host cache directory.
+	      · from: stage name for the root of the source. Defaults to host cache directory.
 
-              · rw, read-write: allows writes on the mount.
+	      · rw, read-write: allows writes on the mount.
 
 **RUN --network**
 
@@ -207,7 +219,7 @@ Container engines pass secret the secret file into the build using the `--secret
 
 **--mount**=*type=secret,TYPE-SPECIFIC-OPTION[,...]*
 
-- `id` is the identifier for the secret passed into the `buildah bud --secret` or `podman build --secret`. This identifier is associated with the RUN --mount identifier to use in the Containerfile.
+- `id` is the identifier for the secret passed into the `buildah build --secret` or `podman build --secret`. This identifier is associated with the RUN --mount identifier to use in the Containerfile.
 
 - `dst`|`target`|`destination` rename the secret file to a specific file in the Containerfile RUN command to use.
 
@@ -224,7 +236,7 @@ RUN --mount=type=secret,id=mysecret,dst=/foobar cat /foobar
 The secret needs to be passed to the build using the --secret flag. The final image built does not container the secret file:
 
 ```
- buildah bud --no-cache --secret id=mysecret,src=mysecret.txt .
+ buildah build --no-cache --secret id=mysecret,src=mysecret.txt .
 ```
 
   -- The **RUN** instruction executes any commands in a new layer on top of the current
@@ -463,7 +475,7 @@ The secret needs to be passed to the build using the --secret flag. The final im
   In the above example, the output of the **pwd** command is **a/b/c**.
 
 **ARG**
-   -- ARG <name>[=<default value>]
+   -- `ARG <name>[=<default value>]`
 
   The `ARG` instruction defines a variable that users can pass at build-time to
   the builder with the `podman build` and `buildah build` commands using the
@@ -594,6 +606,56 @@ The secret needs to be passed to the build using the --secret flag. The final im
   $ podman build --build-arg HTTPS_PROXY=https://my-proxy.example.com .
   ```
 
+**Platform/OS/Arch ARG**
+   -- `ARG <name>`
+
+  When building multi-arch manifest-lists or images for a foreign-architecture,
+  it's often helpful to have access to platform details within the `Containerfile`.
+  For example, when using a `RUN curl ...` command to install OS/Arch specific
+  binary into the image.  Or, if certain `RUN` operations are known incompatible
+  or non-performant when emulating a specific architecture.
+
+  There are several named `ARG` variables available. The purpose of each should be
+  self-evident by its name.  _However_, in all cases these ARG values are **not**
+  automatically populated.  You must always declare them within each `FROM` section
+  of the `Containerfile`.
+
+  The available `ARG <name>` variables are available with two prefixes:
+
+  * `TARGET...` variable names represent details about the currently running build
+    context (i.e. "inside" the container).  These are often the most useful:
+    * `TARGETOS`: For example `linux`
+    * `TARGETARCH`: For example `amd64`
+    * `TARGETPLATFORM`: For example `linux/amd64`
+    * `TARGETVARIANT`: Uncommonly used, specific to `TARGETARCH`
+  * `BUILD...` variable names signify details about the _host_ performing the build
+    (i.e. "outside" the container):
+    * `BUILDOS`: OS of host performing the build
+    * `BUILDARCH`: Arch of host performing the build
+    * `BUILDPLATFORM`: Combined OS/Arch of host performing the build
+    * `BUILDVARIANT`: Uncommonly used, specific to `BUILDARCH`
+
+  An example `Containerfile` that uses `TARGETARCH` to fetch an arch-specific binary could be:
+
+  ```
+  FROM busybox
+  ARG TARGETARCH
+  RUN curl -sSf -O https://example.com/downloads/bin-${TARGETARCH}.zip
+  ```
+
+  Assuming the host platform is `linux/amd64` and foreign-architecture emulation
+  enabled (e.g. `qemu-user-static`), then running the command:
+
+  ```
+  $ podman build --platform linux/s390x .
+  ```
+
+  Would end up running `curl` on `https://example.com/downloads/bin-s390x.zip` and producing
+  a container image suited for the the `linux/s390x` platform.  **Note:** Emulation isn't
+  strictly required, these special build-args will also function when building using
+  `podman farm build`.
+
+
 **ONBUILD**
   -- `ONBUILD [INSTRUCTION]`
   The **ONBUILD** instruction adds a trigger instruction to an image. The

SOURCES/containers-policy.json.5.md

@@ -320,7 +320,9 @@ This requirement requires an image to be signed using a sigstore signature with
 {
     "type":    "sigstoreSigned",
     "keyPath": "/path/to/local/public/key/file",
+    "keyPaths": ["/path/to/first/public/key/one", "/path/to/first/public/key/two"],
     "keyData": "base64-encoded-public-key-data",
+    "keyDatas": ["base64-encoded-public-key-one-data", "base64-encoded-public-key-two-data"]
     "fulcio": {
         "caPath": "/path/to/local/CA/file",
         "caData": "base64-encoded-CA-data",
@@ -328,28 +330,33 @@ This requirement requires an image to be signed using a sigstore signature with
         "subjectEmail", "expected-signing-user@example.com",
     },
     "rekorPublicKeyPath": "/path/to/local/public/key/file",
+    "rekorPublicKeyPaths": ["/path/to/local/public/key/one","/path/to/local/public/key/two"],
     "rekorPublicKeyData": "base64-encoded-public-key-data",
+    "rekorPublicKeyDatas": ["base64-encoded-public-key-one-data","base64-encoded-public-key-two-data"],
     "signedIdentity": identity_requirement
 }
 ```
-Exactly one of `keyPath`, `keyData` and `fulcio` must be present.
+Exactly one of `keyPath`, `keyPaths`, `keyData`, `keyDatas` 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 `keyPaths` or `keyDatas` is present, it contains sigstore public keys.
+Only signatures made by any key in the list 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;
+At most one of `rekorPublicKeyPath`, `rekorPublicKeyPaths`, `rekorPublicKeyData` and `rekorPublicKeyDatas` 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.
+signed by one of the provided public keys.
 
 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).

SOURCES/containers-registries.conf.5.md

@@ -19,6 +19,12 @@ Container engines will use the `$HOME/.config/containers/registries.conf` if it
 `credential-helpers`
 : An array of default credential helpers used as external credential stores.  Note that "containers-auth.json" is a reserved value to use auth files as specified in containers-auth.json(5).  The credential helpers are set to `["containers-auth.json"]` if none are specified.
 
+`additional-layer-store-auth-helper`
+: A string containing the helper binary name. This enables passing registry credentials to an
+  Additional Layer Store every time an image is read using the `docker://`
+  transport so that it can access private registries. See the 'Enabling Additional Layer Store to access to private registries' section below for
+  more details.
+
 ### NAMESPACED `[[registry]]` SETTINGS
 
 The bulk of the configuration is represented as an array of `[[registry]]`
@@ -254,6 +260,30 @@ 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.
 
+### Enabling Additional Layer Store to access to private registries
+
+The `additional-layer-store-auth-helper` option enables passing registry
+credentials to an Additional Layer Store so that it can access private registries.
+
+When accessing a private registry via an Additional Layer Store, a helper binary needs to be provided. This helper binary is
+registered via the `additional-layer-store-auth-helper` option. Every time an image
+is read using the `docker://` transport, the specified helper binary is executed
+and receives registry credentials from stdin in the following format.
+
+```json
+{
+  "$image_reference": {
+    "username": "$username",
+    "password": "$password",
+    "identityToken": "$identityToken"
+  }
+}
+```
+
+The format of `$image_reference` is `$repo{:$tag|@$digest}`.
+
+Additional Layer Stores can use this helper binary to access the private registry.
+
 ## VERSION 1 FORMAT - DEPRECATED
 VERSION 1 format is still supported but it does not support
 using registry mirrors, longest-prefix matches, or location rewriting.

SOURCES/containers-storage.conf.5.md

@@ -27,7 +27,7 @@ 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.
+  Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "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.
@@ -84,7 +84,7 @@ 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=""}
+**pull_options** = {enable_partial_images = "true", 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
@@ -95,7 +95,7 @@ container registry. These options can deduplicate pulling of content, disk
 storage of content and can allow the kernel to use less memory when running
 containers.
 
-containers/storage supports three keys
+containers/storage supports four 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.
@@ -107,28 +107,10 @@ containers/storage supports three keys
     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
+    If set to true, containers/storage will convert images to 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"
-
-  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.
-
-  Example
-     remap-user = "containers"
-     remap-group = "containers"
-
 **root-auto-userns-user**=""
   Root-auto-userns-user is a user name which can be used to look up one or more UID/GID ranges in the /etc/subuid and /etc/subgid file.  These ranges will be partitioned to containers configured to create automatically a user namespace.  Containers configured to automatically create a user namespace can still overlap with containers having an explicit mapping set.  This setting is ignored when running as rootless.
 
@@ -158,66 +140,6 @@ The `storage.options.btrfs` table supports the following options:
 **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))
 
-### STORAGE OPTIONS FOR THINPOOL (devicemapper) TABLE
-
-The `storage.options.thinpool` table supports the following options for the `devicemapper` driver:
-
-**autoextend_percent**=""
-  Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (default: 20%)
-
-**autoextend_threshold**=""
-  Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (default: 80%)
-
-**basesize**=""
-  Specifies the size to use when creating the base device, which limits the size of images and containers. (default: 10g)
-
-**blocksize**=""
-  Specifies a custom blocksize to use for the thin pool. (default: 64k)
-
-**directlvm_device**=""
-  Specifies a custom block storage device to use for the thin pool. Required for using graphdriver `devicemapper`.
-
-**directlvm_device_force**=""
-  Tells driver to wipe device (directlvm_device) even if device already has a filesystem.  (default: false)
-
-**fs**="xfs"
-  Specifies the filesystem type to use for the base device. (default: xfs)
-
-**log_level**=""
-  Sets the log level of devicemapper.
-
-    0: LogLevelSuppress 0 (default)
-    2: LogLevelFatal
-    3: LogLevelErr
-    4: LogLevelWarn
-    5: LogLevelNotice
-    6: LogLevelInfo
-    7: LogLevelDebug
-
-**metadata_size**=""
-  metadata_size is used to set the `pvcreate --metadatasize` options when creating thin devices. (Default 128k)
-
-**min_free_space**=""
-  Specifies the min free space percent in a thin pool required for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables. (default: 10%)
-
-**mkfsarg**=""
-  Specifies extra mkfs arguments to be used when creating the base device.
-
-**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.
-
-**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))
-
-**use_deferred_deletion**=""
-  Marks thinpool device for deferred deletion. If the thinpool is in use when the driver attempts to delete it, the driver will attempt to delete device every 30 seconds until successful, or when it restarts.  Deferred deletion permanently deletes the device and all data stored in the device will be lost. (default: true).
-
-**use_deferred_removal**=""
-  Marks devicemapper block device for deferred removal.  If the device is in use when its driver attempts to remove it, the driver tells the kernel to remove the device as soon as possible.  Note this does not free up the disk space, use deferred deletion to fully remove the thinpool.  (default: true).
-
-**xfs_nospace_max_retries**=""
-  Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (default: 0, which means to try continuously.)
-
 ### STORAGE OPTIONS FOR OVERLAY TABLE
 
 The `storage.options.overlay` table supports the following options:
@@ -278,6 +200,9 @@ based file systems.
 **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))
 
+**use_composefs** = "false"
+    Use ComposeFS to mount the data layers image.  ComposeFS support is experimental and not recommended for production use.  (default: false)
+
 ### STORAGE OPTIONS FOR VFS TABLE
 
 The `storage.options.vfs` table supports the following options:

SOURCES/containers-transports.5.md

@@ -9,7 +9,7 @@ containers-transports - description of supported transports for copying and stor
 ## DESCRIPTION
 
 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 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
@@ -18,14 +18,14 @@ directory of the image consumer.
 
 <!-- atomic: is deprecated and not documented here. -->
 
-### **containers-storage**:[**[**storage-specifier**]**]{image-id|docker-reference[@image-id]}
+### **containers-storage:**[**[**_storage-specifier_**]**]{_image-id_|_docker-reference_[**@**_image-id_]}
 
 An image located in a local containers storage.
 The format of _docker-reference_ is described in detail in the **docker** transport.
 
-The _storage-specifier_ allows for referencing storage locations on the file system and has the format `[[driver@]root[+run-root][:options]]` where the optional `driver` refers to the storage driver (e.g., overlay or btrfs) and where `root` is an absolute path to the storage's root directory.
-The optional `run-root` can be used to specify the run directory of the storage where all temporary writable content is stored.
-The optional `options` are a comma-separated list of driver-specific options.
+The _storage-specifier_ allows for referencing storage locations on the file system and has the format `[`[_driver_`@`]_root_[`+`_run-root_][`:`_options_]`]` where the optional _driver_ refers to the storage driver (e.g., `overlay` or `btrfs`) and where _root_ is an absolute path to the storage's root directory.
+The optional _run-root_ can be used to specify the run directory of the storage where all temporary writable content is stored.
+The optional _options_ are a comma-separated list of driver-specific options.
 Please refer to containers-storage.conf(5) for further information on the drivers and supported options.
 
 ### **dir:**_path_
@@ -40,34 +40,38 @@ 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 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`.
+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_.
 
-### **docker-archive:**_path[:{docker-reference|@source-index}]_
+### **docker-archive:**_path_[`:`{_docker-reference_|`@`_source-index_}]
 
 An image is stored in the docker-save(1) formatted file.
-_docker-reference_ must not contain a digest.
-Alternatively, for reading archives, @_source-index_ is a zero-based index in archive manifest
-(to access untagged images).
-If neither _docker-reference_ nor @_source_index is specified when reading an archive, the archive must contain exactly one image.
+
+Unless a tool explicitly documents otherwise,
+a write to a **docker-archive:** destination completely overwrites _path_, replacing it with the single provided image.
 
 The _path_ can refer to a stream, e.g. `docker-archive:/dev/stdin`.
 
-### **docker-daemon:**_docker-reference|algo:digest_
+_docker-reference_ must not contain a digest.
+Alternatively, for reading archives, `@`_source-index_ is a zero-based index in archive manifest
+(to access untagged images).
+If neither _docker-reference_ nor `@`_source_index is specified when reading an archive, the archive must contain exactly one image.
+
+### **docker-daemon:**_docker-reference_|_algo_`:`_digest_
 
 An image stored in the docker daemon's internal storage.
-The image must be specified as a _docker-reference_ or in an alternative _algo:digest_ format when being used as an image source.
-The _algo:digest_ refers to the image ID reported by docker-inspect(1).
+The image must be specified as a _docker-reference_ or in an alternative _algo_`:`_digest_ format when being used as an image source.
+The _algo_`:`_digest_ refers to the image ID reported by docker-inspect(1).
 
-### **oci:**_path[:reference]_
+### **oci:**_path_[`:`_reference_]
 
 An image in a directory structure compliant with the "Open Container Image Layout Specification" at _path_.
 
@@ -75,18 +79,21 @@ The _path_ value terminates at the first `:` character; any further `:` characte
 The _reference_ is used to set, or match, the `org.opencontainers.image.ref.name` annotation in the top-level index.
 If _reference_ is not specified when reading an image, the directory must contain exactly one image.
 
-### **oci-archive:**_path[:reference]_
+### **oci-archive:**_path_[`:`_reference_]
 
 An image in a tar(1) archive with contents compliant with the "Open Container Image Layout Specification" at _path_.
 
+Unless a tool explicitly documents otherwise,
+a write to an **oci-archive:** destination completely overwrites _path_, replacing it with the single provided image.
+
 The _path_ value terminates at the first `:` character; any further `:` characters are not separators, but a part of _reference_.
 The _reference_ is used to set, or match, the `org.opencontainers.image.ref.name` annotation in the top-level index.
 If _reference_ is not specified when reading an archive, the archive must contain exactly one image.
 
-### **ostree:**_docker-reference[@/absolute/repo/path]_
+### **ostree:**_docker-reference_[`@`_/absolute/repo/path_]
 
 An image in the local ostree(1) repository.
-_/absolute/repo/path_ defaults to _/ostree/repo_.
+_/absolute/repo/path_ defaults to `/ostree/repo`.
 
 ### **sif:**_path_
 

SOURCES/containers.conf

@@ -10,7 +10,8 @@
 # locations in the following order:
 #  1. /usr/share/containers/containers.conf
 #  2. /etc/containers/containers.conf
-#  3. $HOME/.config/containers/containers.conf (Rootless containers ONLY)
+#  3. $XDG_CONFIG_HOME/containers/containers.conf or
+#     $HOME/.config/containers/containers.conf if $XDG_CONFIG_HOME is not set
 #  Items specified in the latter containers.conf, if they exist, override the
 # previous containers.conf settings, or the default settings.
 
@@ -57,20 +58,19 @@
 # List of default capabilities for containers. If it is empty or commented out,
 # the default capabilities defined in the container engine will be added.
 #
-default_capabilities = [
-  "NET_RAW",
-  "CHOWN",
-  "DAC_OVERRIDE",
-  "FOWNER",
-  "FSETID",
-  "KILL",
-  "NET_BIND_SERVICE",
-  "SETFCAP",
-  "SETGID",
-  "SETPCAP",
-  "SETUID",
-  "SYS_CHROOT",
-]
+#default_capabilities = [
+#  "CHOWN",
+#  "DAC_OVERRIDE",
+#  "FOWNER",
+#  "FSETID",
+#  "KILL",
+#  "NET_BIND_SERVICE",
+#  "SETFCAP",
+#  "SETGID",
+#  "SETPCAP",
+#  "SETUID",
+#  "SYS_CHROOT",
+#]
 
 # A list of sysctls to be set in containers by default,
 # specified as "name=value",
@@ -165,6 +165,13 @@ default_sysctls = [
 #
 #ipcns = "shareable"
 
+# Default way to set an interface name inside container. Defaults to legacy
+# pattern of ethX, where X is a integer, when left undefined.
+# Options are:
+#  "device"   Uses the network_interface name from the network config as interface name.
+#             Falls back to the ethX pattern if the network_interface is not set.
+#interface_name = ""
+
 # keyring tells the container engine whether to create
 # a kernel keyring for use within the container.
 #
@@ -185,7 +192,6 @@ default_sysctls = [
 # Logging driver for the container. Available options: k8s-file and journald.
 #
 #log_driver = "k8s-file"
-log_driver = "k8s-file"
 
 # Maximum size allowed for the container log file. Negative numbers indicate
 # that no size limit is imposed. If positive, it must be >= 8192 to match or
@@ -322,7 +328,6 @@ log_driver = "k8s-file"
 # iptables rules and network interfaces might leak on the host. A reboot will fix this.
 #
 #network_backend = ""
-network_backend = "cni"
 
 # Path to directory where CNI plugin binaries are located.
 #
@@ -343,6 +348,14 @@ network_backend = "cni"
 #  "/usr/lib/netavark",
 #]
 
+# The firewall driver to be used by netavark.
+# The default is empty which means netavark will pick one accordingly. Current supported
+# drivers are "iptables", "nftables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
+# experimental at the moment and not recommend outside of testing).
+#
+#firewall_driver = ""
+
+
 # The network name of the default network to attach pods to.
 #
 #default_network = "podman"
@@ -371,9 +384,9 @@ network_backend = "cni"
 
 
 # Configure which rootless network program to use by default. Valid options are
-# `slirp4netns` (default) and `pasta`.
+# `slirp4netns` and `pasta` (default).
 #
-#default_rootless_network_cmd = "slirp4netns"
+#default_rootless_network_cmd = "pasta"
 
 # Path to the directory where network configuration files are located.
 # For the CNI backend the default is "/etc/cni/net.d" as root
@@ -422,6 +435,9 @@ network_backend = "cni"
 
 # The compression format to use when pushing an image.
 # Valid options are: `gzip`, `zstd` and `zstd:chunked`.
+# This field is ignored when pushing images to the docker-daemon and
+# docker-archive formats. It is also ignored when the manifest format is set
+# to v2s2.
 #
 #compression_format = "gzip"
 
@@ -508,12 +524,20 @@ network_backend = "cni"
 # 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
 
+# Whenever Podman should log healthcheck events.
+# With many running healthcheck on short interval Podman will spam the event
+# log a lot as it generates a event for each single healthcheck run. Because
+# this event is optional and only useful to external consumers that may want
+# to know when a healthcheck is run or failed allow users to turn it off by
+# setting it to false. The default is true.
+#
+#healthcheck_events = true
+
 # A is a list of directories which are used to search for helper binaries.
 #
 #helper_binaries_dir = [
@@ -529,6 +553,12 @@ events_logger = "file"
 #  "/usr/share/containers/oci/hooks.d",
 #]
 
+# Directories to scan for CDI Spec files.
+#
+#cdi_spec_dirs = [
+#  "/etc/cdi",
+#]
+
 # Manifest Type (oci, v2s2, or v2s1) to use when pulling, pushing, building
 # container images. By default image pulled and pushed match the format of the
 # source image. Building/committing defaults to OCI.
@@ -545,7 +575,7 @@ 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
+#   * anonymous: 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
@@ -624,7 +654,8 @@ events_logger = "file"
 #
 #no_pivot_root = false
 
-# Number of locks available for containers and pods.
+# Number of locks available for containers, pods, and volumes. Each container,
+# pod, and volume consumes 1 lock for as long as it exists.
 # If this is changed, a lock renumber must be performed (e.g. with the
 # 'podman system renumber' command).
 #
@@ -643,10 +674,20 @@ events_logger = "file"
 #
 #remote = false
 
+# Number of times to retry pulling/pushing images in case of failure
+#
+#retry = 3
+
+# Delay between retries in case pulling/pushing image fails.
+# If set, container engines will retry at the set interval,
+# otherwise they delay 2 seconds and then exponentially back off.
+#
+#retry_delay = "2s"
+
 # Default OCI runtime
 #
 #runtime = "crun"
-runtime = "runc"
+runtime = "crun"
 
 # List of the OCI runtimes that support --format=json. When json is supported
 # engine will use it for reporting nicer errors.
@@ -719,9 +760,6 @@ runtime = "runc"
 # A value of 0 is treated as no timeout.
 #volume_plugin_timeout = 5
 
-# Default timeout in seconds for podmansh logins.
-#podmansh_timeout = 30
-
 # Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc)
 [engine.runtimes]
 #crun = [
@@ -734,6 +772,15 @@ runtime = "runc"
 #  "/run/current-system/sw/bin/crun",
 #]
 
+#crun-vm = [
+#  "/usr/bin/crun-vm",
+#  "/usr/local/bin/crun-vm",
+#  "/usr/local/sbin/crun-vm",
+#  "/sbin/crun-vm",
+#  "/bin/crun-vm",
+#  "/run/current-system/sw/bin/crun-vm",
+#]
+
 #kata = [
 #  "/usr/bin/kata-runtime",
 #  "/usr/sbin/kata-runtime",
@@ -789,16 +836,15 @@ 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
+# Default Image used when creating a new VM using `podman machine init`.
+# Can be specified as registry with a bootable OCI artifact, download URL, or a local path.
+# Registry target must be in the form of `docker://registry/repo/image:version`.
+# 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`.
+# If unspecified, the default Podman machine image will be used.
 #
-#image = "testing"
+#image = ""
 
 # Memory in MB a machine is created with.
 #
@@ -823,6 +869,11 @@ runtime = "runc"
 #
 #provider = ""
 
+# Rosetta supports running x86_64 Linux binaries on a Podman machine on Apple silicon.
+# The default value is `true`. Supported on AppleHV(arm64) machines only.
+#
+#rosetta=true
+
 # 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
@@ -836,3 +887,14 @@ runtime = "runc"
 #
 # map of existing farms
 #[farms.list]
+
+[podmansh]
+# Shell to spawn in container. Default: /bin/sh.
+#shell = "/bin/sh"
+#
+# Name of the container the podmansh user should join.
+#container = "podmansh"
+#
+# Default timeout in seconds for podmansh logins.
+# Favored over the deprecated "podmansh_timeout" field.
+#timeout = 30

SOURCES/containers.conf.5.md

@@ -11,10 +11,9 @@ 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.
+for global configuration that effects all users.
+For user specific configuration it reads __\$XDG_CONFIG_HOME/containers/containers.conf__ and
+__\$XDG_CONFIG_HOME/containers/containers.conf.d/\*.conf__ files. When `$XDG_CONFIG_HOME` is not set it falls back to using `$HOME/.config` instead.
 
 Fields specified in containers conf override the default options, as well as
 options in previously read containers.conf files.
@@ -42,13 +41,13 @@ 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__
+ - __\$XDG_CONFIG_HOME/containers/containers.conf.modules__ or  __\$HOME/.config/containers/containers.conf.modules__ if `$XDG_CONFIG_HOME` is not set.
  - __/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.
+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 `$XDG_CONFIG_HOME/$HOME` allow for overriding those in `/etc` and `/usr/share`.
 
 ## APPENDING TO STRING ARRAYS
 
@@ -59,7 +58,7 @@ 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"]
+modules4.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"]`.
@@ -118,7 +117,7 @@ Options are:
 
 **cgroupns**="private"
 
-Default way to to create a cgroup namespace for the container.
+Default way to create a cgroup namespace for the container.
 Options are:
 `private` Create private Cgroup Namespace for the container.
 `host`    Share host Cgroup Namespace with the container.
@@ -227,9 +226,16 @@ 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.
 
+**interface_name**=""
+
+Default way to set interface names inside containers. Defaults to legacy pattern
+of ethX, where X is an integer, when left undefined.
+Options are:
+  `device`   Uses the network_interface name from the network config as interface name. Falls back to the ethX pattern if the network_interface is not set.
+
 **ipcns**="shareable"
 
-Default way to to create a IPC namespace for the container.
+Default way 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.
@@ -276,7 +282,7 @@ 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.
+Default way to create a NET namespace for the container.
 Options are:
   `private` Create private NET Namespace for the container.
   `host`    Share host NET Namespace with the container.
@@ -293,7 +299,7 @@ Tune the host's OOM preferences for containers (accepts values from -1000 to 100
 
 **pidns**="private"
 
-Default way to to create a PID namespace for the container.
+Default way to create a PID namespace for the container.
 Options are:
   `private` Create private PID Namespace for the container.
   `host`    Share host PID Namespace with the container.
@@ -346,14 +352,14 @@ Sets umask inside the container.
 
 **userns**="host"
 
-Default way to to create a USER namespace for the container.
+Default way to create a USER namespace for the container.
 Options are:
   `private` Create private USER Namespace for the container.
   `host`    Share host USER Namespace with the container.
 
 **utsns**="private"
 
-Default way to to create a UTS namespace for the container.
+Default way to create a UTS namespace for the container.
 Options are:
   `private` Create private UTS Namespace for the container.
   `host`    Share host UTS Namespace with the container.
@@ -436,10 +442,10 @@ default_subnet_pools = [
 ]
 ```
 
-**default_rootless_network_cmd**="slirp4netns"
+**default_rootless_network_cmd**="pasta"
 
 Configure which rootless network program to use by default. Valid options are
-`slirp4netns` (default) and `pasta`.
+`slirp4netns` and `pasta` (default).
 
 **network_config_dir**="/etc/cni/net.d/"
 
@@ -449,6 +455,13 @@ and __$HOME/.config/cni/net.d__ as rootless.
 For the netavark backend "/etc/containers/networks" is used as root
 and "$graphroot/networks" as rootless.
 
+**firewall_driver**=""
+
+The firewall driver to be used by netavark.
+The default is empty which means netavark will pick one accordingly. Current supported
+drivers are "iptables", "nftables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
+experimental at the moment and not recommend outside of testing).
+
 **dns_bind_port**=53
 
 Port to use for dns forwarding daemon with netavark in rootful bridge
@@ -569,7 +582,7 @@ 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,
+If the maximum size is set to 0, then no limit will be applied,
 and the logfile will not be rotated.
 
 **events_logger**="journald"
@@ -589,6 +602,17 @@ Valid values are: `file`, `journald`, and `none`.
 Creates a more verbose container-create event which includes a JSON payload
 with detailed information about the container.  Set to false by default.
 
+**healthcheck_events**=true|false
+
+Whenever Podman should log healthcheck events.
+With many running healthcheck on short interval Podman will spam the event
+log a lot as it generates a event for each single healthcheck run. Because
+this event is optional and only useful to external consumers that may want
+to know when a healthcheck is run or failed allow users to turn it off by
+setting it to false.
+
+Default is true.
+
 **helper_binaries_dir**=["/usr/libexec/podman", ...]
 
 A is a list of directories which are used to search for helper binaries.
@@ -630,6 +654,10 @@ The default path on Windows is:
 
 Path to the OCI hooks directories for automatically executed hooks.
 
+**cdi_spec_dirs**=["/etc/cdi", ...]
+
+Directories to scan for CDI Spec files.
+
 **image_default_format**="oci"|"v2s2"|"v2s1"
 
 Manifest Type (oci, v2s2, or v2s1) to use when pulling, pushing, building
@@ -722,10 +750,11 @@ Whether to use chroot instead of pivot_root in the runtime.
 
 **num_locks**=2048
 
-Number of locks available for containers and pods. Each created container or
-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.
+Number of locks available for containers, pods, and volumes.
+Each created container, pod, or volume consumes one lock.
+Locks are recycled and can be reused after the associated container, pod, or volume is removed.
+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"
 
@@ -749,13 +778,21 @@ Pull image before running or creating a container. The default is **missing**.
 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.
 
+**retry** = 3
+
+Number of times to retry pulling/pushing images in case of failure.
+
+**retry_delay** = ""
+
+Delay between retries in case pulling/pushing image fails. If set, container engines will retry at the set interval, otherwise they delay 2 seconds and then exponentially back off.
+
 **runtime**=""
 
 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".
+on the system using the priority: "crun", "runc", "runj", "kata", "runsc", "ocijail"
 
-**runtime_supports_json**=["crun", "runc", "kata", "runsc", "youki", "krun"]
+**runtime_supports_json**=["crun", "crun-vm", "runc", "kata", "runsc", "youki", "krun"]
 
 The list of the OCI runtimes that support `--format=json`.
 
@@ -763,7 +800,7 @@ The list of the OCI runtimes that support `--format=json`.
 
 The list of OCI runtimes that support running containers with KVM separation.
 
-**runtime_supports_nocgroups**=["crun", "krun"]
+**runtime_supports_nocgroups**=["crun", "crun-vm", "krun"]
 
 The list of OCI runtimes that support running containers without CGroups.
 
@@ -814,7 +851,10 @@ the primary uid/gid of the container.
 
 **compression_format**="gzip"
 
-Specifies the compression format to use when pushing an image. Supported values are: `gzip`, `zstd` and `zstd:chunked`.
+Specifies the compression format to use when pushing an image. Supported values
+are: `gzip`, `zstd` and `zstd:chunked`. This field is ignored when pushing
+images to the docker-daemon and docker-archive formats. It is also ignored
+when the manifest format is set to v2s2.
 
 **compression_level**="5"
 
@@ -823,10 +863,6 @@ 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.
 
@@ -883,13 +919,13 @@ 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`.
-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.
+Image used when creating a new VM using `podman machine init`.
+Can be specified as a registry with a bootable OCI artifact, download URL, or a local path.
+Registry target must be in the form of `docker://registry/repo/image:version`.
+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.
+If unspecified, the default Podman machine image will be used.
 
 **memory**=2048
 
@@ -917,6 +953,11 @@ 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`.
 
+**rosetta**="true"
+
+Rosetta supports running x86_64 Linux binaries on a Podman machine on Apple silicon.
+The default value is `true`. Supported on AppleHV(arm64) machines only.
+
 ## 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`.
 
@@ -928,6 +969,25 @@ The default farm to use when farming out builds.
 
 Map of farms created where the key is the farm name and the value is the list of system connections.
 
+## PODMANSH TABLE
+The `podmansh` table contains configuration options used by podmansh.
+
+**shell**="/bin/sh"
+
+The shell to spawn in the container.
+The default value is `/bin/sh`.
+
+**container**="podmansh"
+
+Name of the container that podmansh joins.
+The default value is `podmansh`.
+
+**timeout**=0
+
+Number of seconds to wait for podmansh logins. This value if favoured over the deprecated field `engine.podmansh_timeout` if set.
+The default value is 30.
+
+
 # FILES
 
 **containers.conf**
@@ -937,8 +997,8 @@ 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__.
+For user specific configuration it reads __\$XDG_CONFIG_HOME/containers/containers.conf__ and
+__\$XDG_CONFIG_HOME/containers/containers.conf.d/\*.conf__ files. When `$XDG_CONFIG_HOME` is not set it falls back to using `$HOME/.config` instead.
 
 Fields specified in a containers.conf file override the default options, as
 well as options in previously loaded containers.conf files.

SOURCES/registries.conf

@@ -76,4 +76,4 @@ unqualified-search-registries = ["registry.access.redhat.com", "registry.redhat.
 # # 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.
-short-name-mode = "permissive"
+short-name-mode = "enforcing"

SOURCES/seccomp.json

@@ -55,9 +55,16 @@
 		{
 			"names": [
 				"bdflush",
+				"cachestat",
+				"futex_requeue",
+				"futex_wait",
+				"futex_waitv",
+				"futex_wake",
 				"io_pgetevents",
+				"io_pgetevents_time64",
 				"kexec_file_load",
 				"kexec_load",
+				"map_shadow_stack",
 				"migrate_pages",
 				"move_pages",
 				"nfsservctl",
@@ -72,9 +79,9 @@
 				"pciconfig_write",
 				"sgetmask",
 				"ssetmask",
-				"swapcontext",
 				"swapoff",
 				"swapon",
+				"syscall",
 				"sysfs",
 				"uselib",
 				"userfaultfd",
@@ -149,6 +156,7 @@
 				"fchdir",
 				"fchmod",
 				"fchmodat",
+				"fchmodat2",
 				"fchown",
 				"fchown32",
 				"fchownat",
@@ -316,7 +324,6 @@
 				"pwritev2",
 				"read",
 				"readahead",
-				"readdir",
 				"readlink",
 				"readlinkat",
 				"readv",
@@ -404,15 +411,12 @@
 				"shmdt",
 				"shmget",
 				"shutdown",
-				"sigaction",
 				"sigaltstack",
 				"signal",
 				"signalfd",
 				"signalfd4",
-				"sigpending",
 				"sigprocmask",
 				"sigreturn",
-				"sigsuspend",
 				"socket",
 				"socketcall",
 				"socketpair",
@@ -427,7 +431,6 @@
 				"sync",
 				"sync_file_range",
 				"syncfs",
-				"syscall",
 				"sysinfo",
 				"syslog",
 				"tee",
@@ -440,7 +443,6 @@
 				"timer_gettime64",
 				"timer_settime",
 				"timer_settime64",
-				"timerfd",
 				"timerfd_create",
 				"timerfd_gettime",
 				"timerfd_gettime64",
@@ -562,7 +564,8 @@
 		},
 		{
 			"names": [
-				"sync_file_range2"
+				"sync_file_range2",
+				"swapcontext"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
@@ -642,6 +645,20 @@
 			},
 			"excludes": {}
 		},
+		{
+			"names": [
+				"riscv_flush_icache"
+			],
+			"action": "SCMP_ACT_ALLOW",
+			"args": [],
+			"comment": "",
+			"includes": {
+				"arches": [
+					"riscv64"
+				]
+			},
+			"excludes": {}
+		},
 		{
 			"names": [
 				"open_by_handle_at"
@@ -677,8 +694,8 @@
 				"bpf",
 				"fanotify_init",
 				"lookup_dcookie",
-				"perf_event_open",
 				"quotactl",
+				"quotactl_fd",
 				"setdomainname",
 				"sethostname",
 				"setns"
@@ -695,11 +712,11 @@
 		},
 		{
 			"names": [
-				"bpf",
 				"fanotify_init",
 				"lookup_dcookie",
 				"perf_event_open",
 				"quotactl",
+				"quotactl_fd",
 				"setdomainname",
 				"sethostname",
 				"setns"
@@ -1047,6 +1064,68 @@
 				]
 			},
 			"excludes": {}
+		},
+		{
+			"names": [
+				"bpf"
+			],
+			"action": "SCMP_ACT_ERRNO",
+			"args": [],
+			"comment": "",
+			"includes": {},
+			"excludes": {
+				"caps": [
+					"CAP_SYS_ADMIN",
+					"CAP_BPF"
+				]
+			},
+			"errnoRet": 1,
+			"errno": "EPERM"
+		},
+		{
+			"names": [
+				"bpf"
+			],
+			"action": "SCMP_ACT_ALLOW",
+			"args": [],
+			"comment": "",
+			"includes": {
+				"caps": [
+					"CAP_BPF"
+				]
+			},
+			"excludes": {}
+		},
+		{
+			"names": [
+				"perf_event_open"
+			],
+			"action": "SCMP_ACT_ERRNO",
+			"args": [],
+			"comment": "",
+			"includes": {},
+			"excludes": {
+				"caps": [
+					"CAP_SYS_ADMIN",
+					"CAP_BPF"
+				]
+			},
+			"errnoRet": 1,
+			"errno": "EPERM"
+		},
+		{
+			"names": [
+				"perf_event_open"
+			],
+			"action": "SCMP_ACT_ALLOW",
+			"args": [],
+			"comment": "",
+			"includes": {
+				"caps": [
+					"CAP_PERFMON"
+				]
+			},
+			"excludes": {}
 		}
 	]
 }

SOURCES/shortnames.conf

@@ -20,6 +20,7 @@
   "registry" = "docker.io/library/registry"
   "swarm" = "docker.io/library/swarm"
   # Fedora
+  "fedora-bootc" = "registry.fedoraproject.org/fedora-bootc"
   "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
   "fedora" = "registry.fedoraproject.org/fedora"
   # Gentoo
@@ -56,6 +57,7 @@
   "rhel7" = "registry.access.redhat.com/rhel7"
   "rhel7.9" = "registry.access.redhat.com/rhel7.9"
   "rhel-atomic" = "registry.access.redhat.com/rhel-atomic"
+  "rhel9-bootc" = "registry.redhat.io/rhel9/rhel-bootc"
   "rhel-minimal" = "registry.access.redhat.com/rhel-minimal"
   "rhel-init" = "registry.access.redhat.com/rhel-init"
   "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
@@ -100,7 +102,7 @@
   "ubi9/buildah" = "registry.access.redhat.com/ubi9/buildah"
   "ubi9/skopeo" = "registry.access.redhat.com/ubi9/skopeo"
   # Rocky Linux
-  "rockylinux" = "docker.io/library/rockylinux"
+  "rockylinux" = "quay.io/rockylinux/rockylinux"
   # Debian
   "debian" = "docker.io/library/debian"
   # Kali Linux

SOURCES/storage.conf

@@ -19,6 +19,10 @@ driver = "overlay"
 # Temporary storage location
 runroot = "/run/containers/storage"
 
+# Priority list for the storage drivers that will be tested one
+# after the other to pick the storage driver if it is not defined.
+# driver_priority = ["overlay", "btrfs"]
+
 # Primary Read/Write location of container storage
 # When changing the graphroot location on an SELINUX system, you must
 # ensure  the labeling matches the default locations labels with the
@@ -59,7 +63,7 @@ additionalimagestores = [
 # can deduplicate pulling of content, disk storage of content and can allow the
 # kernel to use less memory when running containers.
 
-# containers/storage supports three keys
+# containers/storage supports four 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.
@@ -70,29 +74,12 @@ additionalimagestores = [
 #     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
-# 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.
-#
-# 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
-# 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 = "containers"
-# remap-group = "containers"
+#   * convert_images = "false" | "true"
+#     If set to true, containers/storage will convert images to a
+#     format compatible with partial pulls in order to take advantage
+#     of local deduplication and hard linking.  It is an expensive
+#     operation so it is not enabled by default.
+pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""}
 
 # Root-auto-userns-user is a user name which can be used to look up one or more UID/GID
 # ranges in the /etc/subuid and /etc/subgid file.  These ranges will be partitioned
@@ -130,6 +117,9 @@ mountopt = "nodev,metacopy=on"
 # Set to skip a PRIVATE bind mount on the storage home directory.
 # skip_mount_home = "false"
 
+# Set to use composefs to mount data layers with overlay.
+# use_composefs = "false"
+
 # Size is used to set a maximum size of the container image.
 # size = ""
 
@@ -165,79 +155,3 @@ mountopt = "nodev,metacopy=on"
 #  "force_mask"  permissions.
 #
 # force_mask = ""
-
-[storage.options.thinpool]
-# Storage Options for thinpool
-
-# autoextend_percent determines the amount by which pool needs to be
-# grown. This is specified in terms of % of pool size. So a value of 20 means
-# that when threshold is hit, pool will be grown by 20% of existing
-# pool size.
-# autoextend_percent = "20"
-
-# autoextend_threshold determines the pool extension threshold in terms
-# of percentage of pool size. For example, if threshold is 60, that means when
-# pool is 60% full, threshold has been hit.
-# autoextend_threshold = "80"
-
-# basesize specifies the size to use when creating the base device, which
-# limits the size of images and containers.
-# basesize = "10G"
-
-# blocksize specifies a custom blocksize to use for the thin pool.
-# blocksize="64k"
-
-# directlvm_device specifies a custom block storage device to use for the
-# thin pool. Required if you setup devicemapper.
-# directlvm_device = ""
-
-# directlvm_device_force wipes device even if device already has a filesystem.
-# directlvm_device_force = "True"
-
-# fs specifies the filesystem type to use for the base device.
-# fs="xfs"
-
-# log_level sets the log level of devicemapper.
-# 0: LogLevelSuppress 0 (Default)
-# 2: LogLevelFatal
-# 3: LogLevelErr
-# 4: LogLevelWarn
-# 5: LogLevelNotice
-# 6: LogLevelInfo
-# 7: LogLevelDebug
-# log_level = "7"
-
-# min_free_space specifies the min free space percent in a thin pool require for
-# new device creation to succeed. Valid values are from 0% - 99%.
-# Value 0% disables
-# min_free_space = "10%"
-
-# mkfsarg specifies extra mkfs arguments to be used when creating the base
-# device.
-# mkfsarg = ""
-
-# metadata_size is used to set the `pvcreate --metadatasize` options when
-# creating thin devices. Default is 128k
-# metadata_size = ""
-
-# Size is used to set a maximum size of the container image.
-# size = ""
-
-# use_deferred_removal marks devicemapper block device for deferred removal.
-# If the thinpool is in use when the driver attempts to remove it, the driver
-# tells the kernel to remove it as soon as possible. Note this does not free
-# up the disk space, use deferred deletion to fully remove the thinpool.
-# use_deferred_removal = "True"
-
-# use_deferred_deletion marks thinpool device for deferred deletion.
-# If the device is busy when the driver attempts to delete it, the driver
-# will attempt to delete device every 30 seconds until successful.
-# If the program using the driver exits, the driver will continue attempting
-# to cleanup the next time the driver is used. Deferred deletion permanently
-# deletes the device and all data stored in device will be lost.
-# use_deferred_deletion = "True"
-
-# xfs_nospace_max_retries specifies the maximum number of retries XFS should
-# attempt to complete IO when ENOSPC (no space) error is returned by
-# underlying storage device.
-# xfs_nospace_max_retries = "0"

SPECS/containers-common.spec

@@ -4,19 +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.32.2
+%global common_branch v0.60.2
+%global storage_branch v1.55.0
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 81%{?dist}
+Release: 93%{?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}
@@ -175,256 +173,276 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
-* Wed Apr 03 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1-81
-- Rebuilt for MSVSphere 8.10 beta
+* Thu Oct 17 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-93
+- rebuild
+- Resolves: RHEL-62937
 
-* Wed Feb 14 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-81
-- Update shortnames from Pyxis
-- Related: Jira:RHEL-2110
+* Tue Aug 27 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-92
+- update vendored components
+- Related: RHEL-27608
 
-* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-80
-- bump release to preserve upgrade path
-- Resolves: Jira:RHEL-12277
+* Wed Aug 07 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-91
+- Update shortnames and vendored components
+- Related: RHEL-27608
 
-* Thu Feb 08 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-59
-- update vendored components
-- Related: Jira:RHEL-2110
+* Fri Apr 05 2024 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-90
+- Bump release to way higher than rhel 8.10 to preserve upgrade path
+- Related: Jira:RHEL-31950
+
+* Wed Feb 14 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-62
+- regenerate shortnames from Pyxis and update vendored components
+- Related: Jira:RHEL-2112
 
-* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-58
+* Thu Feb 08 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-61
 - update vendored components
-- Related: Jira:RHEL-2110
+- Related: Jira:RHEL-2112
 
-* Wed Oct 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-57
-- fix shortnames for rhel-minimal
-- Related: Jira:RHEL-2110
+* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-60
+- Update vendored components
+- Related: Jira:RHEL-2112
 
-* Fri Sep 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-56
+* Wed Oct 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-59
+- fix shortnames
+- Related: Jira:RHEL-2112
+
+* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-58
 - implement GPG auto updating mechanism from redhat-release
-- Resolves: #RHEL-2110
+- Resolves: #RHEL-3164
 
-* Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
+* Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-57
 - 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
+* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-56
 - update vendored components and shortnames
-- Related: #2176055
+- Related: #2176063
+
+* Wed Jul 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
+- fix vendoring script
+- Related: #2176063
 
-* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-53
+* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
 - update vendored components
-- Related: #2176055
+- Related: #2176063
 
-* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-52
+* Tue Jun 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-53
+- rebuild
+- Resolves: #2178263
+
+* Fri Apr 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-52
 - update vendored components
-- Related: #2176055
+- Related: #2176063
 
-* Tue Mar 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-51
-- be sure default_capabilities contain SYS_CHROOT
-- Resolves: #2166195
+* Fri Mar 24 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-51
+- regenerate shortnames, vendored components + fix pyxis script
+- Related: #2176063
 
-* Thu Mar 09 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-50
+* Wed Feb 22 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-50
 - improve shortnames generation
-- Related: #2176055
+- Related: #2124478
 
-* Mon Jan 02 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-49
-- update vendored components and configuration files
-- Related: #2123641
+* Tue Jan 31 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-49
+- add missing systemd directories
+- Related: #2124478
 
-* Fri Dec 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-48
+* Mon Jan 30 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-48
 - update vendored components and configuration files
-- Related: #2123641
+- Related: #2124478
 
-* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-47
-- enable NET_RAW capability for RHEL8 only
-- Related: #2123641
+* Thu Jan 05 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-47
+- update vendored components, regenerate pyxis
+- Related: #2124478
 
-* Tue Nov 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-46
-- update vendored components and configuration files
-- Related: #2123641
+* Thu Nov 10 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-46
+- The NET_RAW capability was required in RHEL8 but no longer required in RHEL9
+- Resolves: #2141531
 
 * 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
+- Related: #2124478
+
+* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-44
+- exclude non-go arches because of go-md2man
+- Related: #2061316
 
-* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
+* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-43
 - add beta keys to default-policy.json
-- Related: #2061390
+- Related: #2061316
 
-* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
+* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-42
 - 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
+- Related: #2061316
 
-* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
-- add install section
+* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-41
+- drop aardvark-dns and netavark - packaged separately
 - 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
+- Related: #2061316
 
-* Tue Jul 26 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
+* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
 - remove rhel-els and update shortnames
-- Related: #2061390
+- Related: #2061316
 
-* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+* Tue Jun 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
 - update shortnames
-- Related: #2061390
-
-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
-- additional fix for unqualified registries
-- Related: #2061390
+- Related: #2061316
 
-* 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
-- update vendored components and configuration files
-- Related: #2061390
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
+- fix unqualified registries in registries.conf generation code
+- Related: #2088139
 
-* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-29
+* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
 - update unqualified registries list
-- Related: #2061390
+- Related: #2088139
 
-* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
+* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
 - update aardvark-dns and netavark to 1.0.3
 - update vendored components
-- Related: #2061390
+- Related: #2061316
 
-* 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
+* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
 - 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
+- Related: #2061316
 
-* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
+* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
 - update to netavark and aardvark-dns 1.0.2
 - update vendored components
-- Related: #2061390
+- Related: #2061316
+
+* Mon Mar 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+- allow consuming aardvark-dns and netavark from upstream branches
+- Related: #2061316
 
-* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
+- build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar)
+- Related: #2000051
+
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-31
 - update to netavark and aardvark-dns 1.0.1
-- Related: #2001445
+- Related: #2000051
+
+* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-30
+- archful package should conflict with older noarch package
+- Related: #2000051
 
-* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-22
-- build rust packages with RUSTFLAGS set to make ExecShield happy
-- Related: #2001445
+* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-29
+- consistent release tags for all packages
+- Related: #2000051
 
-* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-21
+* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-28
+- main package should obsolete noarch versions upto 2:1-22
+- Related: #2000051
+
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-27
 - do not specify infra_image in containers.conf
 - needed to resolve gating test failures
-- Related: #2001445
+- Related: #2000051
+
+* Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-26
+- aardvark-dns built for same arches as netavark
+- Related: #2000051
+
+* Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-25
+- build netavark only for podman's arches
+- i686 can't find go-md2man which causes the build to fail otherwise
+- Related: #2000051
 
-* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-20
+* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
 - update to netavark-1.0.0 and aardvark-dns-1.0.0
-- Related: #2001445
+- Related: #2000051
 
-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
 - package aarvark-dns and netavark as part of the containers-common
-- Related: #2001445
+- Related: #2000051
 
-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-22
 - update shortnames and vendored components
-- Related: #2001445
+- Related: #2000051
 
-* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
+* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-21
 - containers.conf should contain network_backend = "cni" in RHEL8.6
-- Related: #2001445
+- Related: #2000051
 
-* Fri Feb 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-16
-- update vendored components and configuration files
-- Related: #2001445
+* Wed Feb 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-20
+- update shortname aliases from upstream
+- Related: #2000051
 
-* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
 - sync vendored components
-- Related: #2001445
+- Related: #2000051
 
-* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-14
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
 - sync vendored components
-- Related: #2001445
+- Related: #2000051
+
+* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
+- sync shortname aliases via Pyxis
+- Related: #2000051
 
-* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-13
-- update shortnames from Pyxis
-- Related: #2001445
+* Fri Dec 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-16
+- do not hardcode log_driver = "journald" and events_logger = "journald"
+  for RHEL9 and leave the rootful/rootless behaviour change based on
+  internal logic
+- Related: #2000051
 
-* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
+* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-15
 - do not allow broken content from Pyxis to land in shortnames.conf
-- Related: #2001445
+- Related: #2000051
 
-* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
-- sync vendored components
-- update shortnames from Pyxis
-- Related: #2001445
+* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-14
+- update vendored component versions
+- sync shortname aliases via Pyxis
+- Related: #2000051
 
-* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
+* Tue Nov 30 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-13
 - use log_driver = "journald" and events_logger = "journald" for RHEL9
-- Related: #2001445
+- Related: #2000051
 
-* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
+* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
 - consume seccomp.json from the oldest vendored version of c/common,
   not main branch
-- Related: #2001445
+- Related: #2000051
+
+* Fri Nov 12 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
+- use ubi8/pause as ubi9/pause is not available yet
+- Related: #2000051
 
-* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-8
+* Wed Nov 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
 - update vendored components
-- Related: #2001445
+- Related: #2000051
 
-* Tue Nov 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
+* Tue Nov 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
 - make log_driver = "k8s-file" default in containers.conf
-- Related: #2001445
+- Related: #2000051
 
-* Wed Oct 13 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-6
-- sync vendored components
-- Related: #2001445
+* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-8
+- perform only sanity/installability tests for now
+- Related: #2000051
 
-* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-5
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
 - update to the new vendored components
-- Related: #2001445
+- Related: #2000051
 
-* Fri Sep 24 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-6
+- add gating.yaml
+- Related: #2000051
+
+* Fri Sep 24 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-5
 - update to the new vendored components
-- Related: #2001445
+- Related: #2000051
+
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
+- fix updating scripts
+- Related: #2000051
 
-* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
+* Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
 - update to the new vendored components
-- Related: #2001445
+- Related: #2000051
 
-* Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-2
-- synchronize config files for RHEL-8.5
-- Related: #1934415
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1-2
+- bump configs to latest versions
+- replace ubi9 references with ubi8
+- Related: #1970747
 
 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-1
 - initial import
-- Related: #1934415
+- Related: #1970747