import containers-common-1-23.module+el8.6.0+14379+4ec2a99a

2022-03-11 21:02:25 +00:00 · 2022-03-11 21:02:25 +00:00 · d34772c200
commit d34772c200
parent 9806a931dd
20 changed files with 2345 additions and 655 deletions
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@ -0,0 +1,4 @@
+9949027d7823485ed426b80758abf2a82b9cc3eb SOURCES/aardvark-dns-v1.0.1-da6bc98.tar.gz
+efcbc896b7b92484f54268578b6847cf961557a1 SOURCES/aardvark-dns-v1.0.1-vendor.tar.gz
+8819bb63ce285e21110f77b7c1d3bdeeeb9705b6 SOURCES/netavark-v1.0.1-5810f9f.tar.gz
+3ed56a259e5a196706c2f27f83d9f46b4704675d SOURCES/netavark-v1.0.1-vendor.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+SOURCES/aardvark-dns-v1.0.1-da6bc98.tar.gz
+SOURCES/aardvark-dns-v1.0.1-vendor.tar.gz
+SOURCES/netavark-v1.0.1-5810f9f.tar.gz
+SOURCES/netavark-v1.0.1-vendor.tar.gz
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
--- a/SOURCES/containers-auth.json.5.md
+++ b/SOURCES/containers-auth.json.5.md
@ -1,4 +1,4 @@
-% containers-auth.json(5)
+% containers-auth.json 5

 # NAME
 containers-auth.json - syntax for the registry authentication file
@ -11,7 +11,7 @@ on Windows and macOS, at `$HOME/.config/containers/auth.json`.

 When searching for the credential for a registry, the following files will be read in sequence until the valid credential is found:
 first reading the primary (read/write) file, or the explicit override using an option of the calling application.
-If credentials are not present, search in `${XDG\_CONFIG\_HOME}/containers/auth.json`, `$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 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.

--- a/SOURCES/containers-certs.d.5.md
+++ b/SOURCES/containers-certs.d.5.md
@ -1,4 +1,4 @@
-% containers-certs.d(5)
+% containers-certs.d 5 Directory for storing custom container-registry TLS configurations

 # NAME
 containers-certs.d - Directory for storing custom container-registry TLS configurations
--- a/SOURCES/containers-policy.json.5.md
+++ b/SOURCES/containers-policy.json.5.md
@ -1,4 +1,4 @@
-% CONTAINERS-POLICY.JSON(5) policy.json Man Page
+% CONTAINERS-POLICY.JSON 5 policy.json Man Page
 % Miloslav Trmač
 % September 2016

--- a/SOURCES/containers-registries.conf.5.md
+++ b/SOURCES/containers-registries.conf.5.md
@ -1,4 +1,4 @@
-% CONTAINERS-REGISTRIES.CONF(5) System-wide registry configuration file
+% CONTAINERS-REGISTRIES.CONF 5 System-wide registry configuration file
 % Brent Baude
 % Aug 2017

--- a/SOURCES/containers-registries.conf.d.5.md
+++ b/SOURCES/containers-registries.conf.d.5.md
@ -1,4 +1,4 @@
-% CONTAINERS-REGISTRIES.CONF.D(5)
+% CONTAINERS-REGISTRIES.CONF.D 5
 % Valentin Rothberg
 % Mar 2020

--- a/SOURCES/containers-registries.d.5.md
+++ b/SOURCES/containers-registries.d.5.md
@ -1,4 +1,4 @@
-% CONTAINERS-REGISTRIES.D(5) Registries.d Man Page
+% containers-registries.d 5 Registries.d Man Page
 % Miloslav Trmač
 % August 2016

--- a/SOURCES/containers-signature.5.md
+++ b/SOURCES/containers-signature.5.md
@ -1,9 +1,11 @@
-% container-signature(5) Container signature format
+% container-signature 5 Container signature format
 % Miloslav Trmač
 % March 2017

-# Container signature format
+# NAME
+container-signature - Container signature format

+# DESCRIPTION
 This document describes the format of container signatures,
 as implemented by the `github.com/containers/image/signature` package.

--- a/SOURCES/containers-storage.conf.5.md
+++ b/SOURCES/containers-storage.conf.5.md
@ -38,7 +38,21 @@ The `storage` table supports the following options:
  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:
+  
+```
+# semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH
+# restorecon -R -v /NEWSTORAGEPATH
+```

+  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.
@ -259,6 +273,13 @@ semanage fcontext -a -e /var/lib/containers NEWSTORAGEPATH
 restorecon -R -v NEWSTORAGEPATH
 ```

+In rootless mode, you would set
+
+```
+semanage fcontext -a -e $HOME/.local/share/containers NEWSTORAGEPATH
+restorecon -R -v NEWSTORAGEPATH
+```
+
 The semanage command above tells SELinux to setup the default labeling of `NEWSTORAGEPATH` to match `/var/lib/containers`.  The `restorecon` command tells SELinux to apply the labels to the actual content.

 Now all new content created in these directories will automatically be created with the correct label.
@ -294,7 +315,11 @@ This is a way to prevent xfs_quota management from conflicting with containers/s

 ## FILES

-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. The storage.conf file for rootless users is 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.
+Distributions often provide a `/usr/share/containers/storage.conf` file to define default storage configuration. Administrators can override this file by creating `/etc/containers/storage.conf` to specify their own configuration. Likewise rootless users can create a storage.conf file to override the system storage.conf files. Files should be stored in the `$XDG_CONFIG_HOME/containers/storage.conf` file.  If `$XDG_CONFIG_HOME` is not set then the file `$HOME/.config/containers/storage.conf` is used.
+
+Note: The storage.conf file overrides all other strorage.conf files. Container
+engines run by users with a storage.conf file in their home directory do not
+use options in the system storage.conf files.

 /etc/projects - XFS persistent project root definition
 /etc/projid -  XFS project name mapping file
--- a/SOURCES/containers-transports.5.md
+++ b/SOURCES/containers-transports.5.md
@ -1,4 +1,4 @@
-% CONTAINERS-TRANSPORTS(5) Containers Transports Man Page
+% CONTAINERS-TRANSPORTS 5 Containers Transports Man Page
 % Valentin Rothberg
 % April 2019

@ -57,12 +57,12 @@ 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).

-### **oci:**_path[:tag]_
+### **oci:**_path[:reference]_

 An image compliant with the "Open Container Image Layout Specification" at _path_.
-Using a _tag_ is optional and allows for storing multiple images at the same _path_.
+Using a _reference_ is optional and allows for storing multiple images at the same _path_.

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

 An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_.

--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@ -153,6 +153,7 @@ 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
@ -198,10 +199,6 @@ default_sysctls = [
 #
 #prepare_volume_on_create = false

-# Indicates the networking to be used for rootless containers
-#
-#rootless_networking = "slirp4netns"
-
 # Path to the seccomp.json profile which is used as the default seccomp profile
 # for the runtime.
 #
@ -250,9 +247,6 @@ default_sysctls = [
 #
 #volumes = []

-# The network table contains settings pertaining to the management of
-# CNI plugins.
-
 [secrets]
 #driver = "file"

@ -261,6 +255,17 @@ default_sysctls = [

 [network]

+# Network backend determines what network driver will be used to set up and tear down container networks.
+# Valid values are "cni" and "netavark".
+# The default value is empty which means that it will automatically choose CNI or netavark. If there are
+# already containers/images or CNI networks preset it will choose CNI.
+#
+# Before changing this value all containers must be stopped otherwise it is likely that
+# 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.
 #
 #cni_plugin_dirs = [
@ -271,18 +276,22 @@ default_sysctls = [
 #  "/opt/cni/bin",
 #]

-# The network name of the default CNI network to attach pods to.
+# The network name of the default network to attach pods to.
 #
 #default_network = "podman"

-# The default subnet for the default CNI network given in default_network.
+# The default subnet for the default network given in default_network.
 # If a network with that name does not exist, a new network using that name and
 # this subnet will be created.
 # Must be a valid IPv4 CIDR prefix.
 #
 #default_subnet = "10.88.0.0/16"

-# Path to the directory where CNI configuration files are located.
+# 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 netavark backend "/etc/containers/networks" is used as root
+# and "$graphroot/networks" as rootless.
 #
 #network_config_dir = "/etc/cni/net.d/"

@ -291,6 +300,12 @@ default_sysctls = [
 #
 #active_service = production

+# The compression format to use when pushing an image.
+# Valid options are: `gzip`, `zstd` and `zstd:chunked`.
+#
+#compression_format = "gzip"
+
+
 # Cgroup management implementation used for the runtime.
 # Valid options "systemd" or "cgroupfs"
 #
@ -314,6 +329,11 @@ default_sysctls = [
 #  "/usr/local/sbin/conmon"
 #]

+# 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 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:
@ -337,6 +357,9 @@ default_sysctls = [
 #
 #env = []

+# Define where event logs will be stored, when events_logger is "file".
+#events_logfile_path=""
+
 # Selects which logging mechanism to use for container engine events.
 # Valid values are `journald`, `file` and `none`.
 #
@ -380,15 +403,16 @@ events_logger = "file"
 # Infra (pause) container image name for pod infra containers.  When running a
 # pod, we start a `pause` process in a container to hold open the namespaces
 # associated with the  pod.  This container does nothing other then sleep,
-# reserving the pods resources for the lifetime of the pod.
+# 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 = "k8s.gcr.io/pause:3.4.1"
-infra_image = "registry.access.redhat.com/ubi8/pause"
+#infra_image = ""

 # 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
+# faster "shm" lock type. You may need to run "podman system renumber" after
 # you change the lock type.
 #
 #lock_type** = "shm"
@ -421,7 +445,7 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
 # Default options to pass to the slirp4netns binary.
 # For example "allow_host_loopback=true"
 #
-#network_cmd_options = []
+#network_cmd_options = ["enable_ipv6=true",]

 # Whether to use chroot instead of pivot_root in the runtime
 #
@ -448,18 +472,28 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
 #runtime = "crun"
 runtime = "runc"

-# List of the OCI runtimes that support --format=json.  When json is supported
+# 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"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"]

 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
-#runtime_supports_kvm = ["kata"]
+#runtime_supports_kvm = ["kata", "krun"]

 # List of the OCI runtimes that supports running containers without cgroups.
 #
-#runtime_supports_nocgroups = ["crun"]
+#runtime_supports_nocgroups = ["crun", "krun"]
+
+# Default location for storing temporary container image content. Can be overridden with the TMPDIR environment
+# variable. If you specify "storage", then the location of the
+# container/storage tmp directory will be used.
+# image_copy_tmp_dir="/var/tmp"
+
+# Number of seconds to wait without a connection
+# before the `podman system service` times out and exits
+#
+#service_timeout = 5

 # Directory for persistent engine files (database, etc)
 # By default, this will be configured relative to where the containers/storage
@ -498,7 +532,7 @@ runtime = "runc"
 #
 #volume_path = "/var/lib/containers/storage/volumes"

-# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, etc)
+# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc)
 [engine.runtimes]
 #crun = [
 #  "/usr/bin/crun",
@ -541,6 +575,11 @@ runtime = "runc"
 #  "/run/current-system/sw/bin/runsc",
 #]

+#krun = [
+#  "/usr/bin/krun",
+#  "/usr/local/bin/krun",
+#]
+
 [engine.volume_plugins]
 #testplugin = "/run/podman/plugins/test.sock"

@ -561,6 +600,11 @@ runtime = "runc"
 #
 #memory=2048

+# The username to use and create on the podman machine OS for rootless
+# container access.
+#
+#user = "core"
+
 # 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
--- a/SOURCES/containers.conf.5.md
+++ b/SOURCES/containers.conf.5.md
@ -11,7 +11,7 @@ a TOML format that can be easily modified and versioned.

 Container engines read the /usr/share/containers/containers.conf and
 /etc/containers/containers.conf, and /etc/containers/containers.conf.d/*.conf files
-if they exist.  When running in rootless mode, they also read
+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.

@ -47,8 +47,7 @@ TOML can be simplified to:
    option = value

 ## CONTAINERS TABLE
-The containers table contains settings pertaining to the OCI runtime that can
-configure and manage the OCI runtime.
+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.
@ -160,7 +159,7 @@ Run an init inside the container that forwards signals and reaps processes.
 **init_path**="/usr/libexec/podman/catatonit"

 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
+within containers. Note that the container-init binary will only be used when
 the `--init` for podman-create and podman-run is set.

 **ipcns**="private"
@ -192,7 +191,7 @@ limit is never exceeded.

 **log_tag**=""

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

 **netns**="private"

@ -204,7 +203,7 @@ Options are:

 **no_hosts**=false

-Create /etc/hosts for the container.  By default, container engines manage
+Create /etc/hosts for the container. By default, container engines manage
 /etc/hosts, automatically adding  the container's  own  IP  address.

 **pidns**="private"
@ -223,11 +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.

-**rootless_networking**="slirp4netns"
-
-Set type of networking rootless containers should use.  Valid options are `slirp4netns`
-or `cni`.
-
 **seccomp_profile**="/usr/share/containers/seccomp.json"

 Path to the seccomp.json profile which is used as the default seccomp profile
@ -279,6 +273,16 @@ Options are:
 The `network` table contains settings pertaining to the management of CNI
 plugins.

+**network_backend**=""
+
+Network backend determines what network driver will be used to set up and tear down container networks.
+Valid values are "cni" and "netavark".
+The default value is empty which means that it will automatically choose CNI or netavark. If there are
+already containers/images or CNI networks preset it will choose CNI.
+
+Before changing this value all containers must be stopped otherwise it is likely that
+iptables rules and network interfaces might leak on the host. A reboot will fix this.
+
 **cni_plugin_dirs**=[]

 List of paths to directories where CNI plugin binaries are located.
@ -296,16 +300,20 @@ cni_plugin_dirs = [

 **default_network**="podman"

-The network name of the default CNI network to attach pods to.
+The network name of the default network to attach pods to.

 **default_subnet**="10.88.0.0/16"

-The subnet to use for the default CNI network (named above in **default_network**).
+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.

 **network_config_dir**="/etc/cni/net.d/"

-Path to the directory where CNI configuration files are located.
+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 netavark backend "/etc/containers/networks" is used as root
+and "$graphroot/networks" as rootless.

 **volumes**=[]

@ -369,10 +377,14 @@ Disabling this can save memory.

 **env**=[]

-Environment variables to be used when running the container engine (e.g., Podman, Buildah).  For example "http_proxy=internal.proxy.company.com".
+Environment variables to be used when running the container engine (e.g., Podman, Buildah). For example "http_proxy=internal.proxy.company.com".
 Note these environment variables will not be used within the container. Set the env section under [containers] table,
 if you want to set environment variables for the container.

+**events_logfile_path**=""
+
+Define where event logs will be stored, when events_logger is "file".
+
 **events_logger**="journald"

 Default method to use when logging events.
@ -423,21 +435,26 @@ Not setting this field will fall back to containers/image defaults. (6)

 **infra_command**="/pause"

-Command to run the infra container.
-
-**infra_image**="k8s.gcr.io/pause:3.4.1"
-
-Infra (pause) container image name for pod infra containers.  When running a
-pod, we start a `pause` process in a container to hold open the namespaces
-associated with the  pod.  This container does nothing other then sleep,
+Infra (pause) container image command for pod infra containers. When running a
+pod, we start a `/pause` process in a container to hold open the namespaces
+associated with the pod. This container does nothing other then sleep,
 reserving the pods resources for the lifetime of the pod.

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

 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
+faster "shm" lock type. You may need to run "podman system renumber" after you
 change the lock type.

 **machine_enabled**=false
@ -448,13 +465,13 @@ 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.
+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.

 **namespace**=""

 Default engine namespace. If the engine is joined to a namespace, it will see
 only containers and pods that were created in the same namespace, and will
-create new containers and pods in that namespace.  The default namespace is "",
+create new containers and pods in that namespace. The default namespace is "",
 which corresponds to no namespace. When no namespace is set, all containers
 and pods are visible.

@ -462,11 +479,23 @@ 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.

-Example "allow_host_loopback=true"
+Valid options values are:
+
+  - **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 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).
+  - **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.

 **no_pivot_root**=false

@ -475,7 +504,7 @@ 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
+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.

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

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

-**runtime_supports_kvm**=["kata"]
+**runtime_supports_kvm**=["kata", "krun"]

 The list of OCI runtimes that support running containers with KVM separation.

-**runtime_supports_nocgroups**=["crun"]
+**runtime_supports_nocgroups**=["crun", "krun"]

 The list of OCI runtimes that support running containers without CGroups.

+**image_copy_tmp_dir**="/var/tmp"
+
+Default location for storing temporary container image content. Can be
+overridden with the TMPDIR environment variable. If you specify "storage", then
+the location of the container/storage tmp directory will be used. If set then it
+is the users responsibility to cleanup storage. Configure tmpfiles.d(5) to
+cleanup storage.
+
+**service_timeout**=**5**
+
+Number of seconds to wait without a connection  before the
+`podman system service` times out and exits
+
 **static_dir**="/var/lib/containers/storage/libpod"

 Directory for persistent libpod files (database, etc).
@ -537,6 +579,10 @@ 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**=""
+
+Specifies the compression format to use when pushing an image. Supported values are: `gzip`, `zstd` and `zstd:chunked`.
+
 ## SERVICE DESTINATION TABLE
 The `service_destinations` table contains configuration options used to set up remote connections to the podman service for the podman API.

@ -587,15 +633,23 @@ Number of CPU's a machine is created with.

 The size of the disk in GB created when init-ing a podman-machine VM

-**image**="testing"
+**image**=""

 Default image used when creating a new VM using `podman machine init`.
-Options: `testing`, `stable`, `next`, or a custom path or download URL to an image
+Options: On Linux/Mac, `testing`, `stable`, `next`. On Windows, the major
+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

 Memory in MB a machine is created with.

+**user**=""
+
+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`.
+
 # FILES

 **containers.conf**
@ -607,7 +661,7 @@ configuration. Rootless users can further override fields in the config by
 creating a config file stored in the `$HOME/.config/containers/containers.conf` file.

 If the `CONTAINERS_CONF` path environment variable is set, just
-this path will be used.  This is primarily used for testing.
+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.
@ -623,6 +677,6 @@ is used for the storage.conf file rather than the default.
 This is primarily used for testing.

 # SEE ALSO
-containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5)
+containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5), tmpfiles.d(5)

 [toml]: https://github.com/toml-lang/toml
--- a/SOURCES/pyxis.sh
+++ b/SOURCES/pyxis.sh
@ -20,6 +20,7 @@ while read -r LINE; do
       [  $REPOSITORY == \"\" ] ||
       [ "$AVAILABLE" != "Generally Available" ] ||
       [[ $REPOSITORY == *[@:]* ]] ||
+       [[ $REPOSITORY == *[* ]] ||
       [[ "$REGISTRY" == *non_registry* ]] ||
       [[ $REGISTRY != *.* ]]
     then
--- a/SOURCES/seccomp.json
+++ b/SOURCES/seccomp.json
@ -1,6 +1,7 @@
 {
 	"defaultAction": "SCMP_ACT_ERRNO",
 	"defaultErrnoRet": 38,
+	"defaultErrno": "ENOSYS",
 	"archMap": [
 		{
 			"architecture": "SCMP_ARCH_X86_64",
@ -87,7 +88,8 @@
 			"comment": "",
 			"includes": {},
 			"excludes": {},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -651,7 +653,8 @@
 					"CAP_DAC_READ_SEARCH"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -694,7 +697,8 @@
 					"CAP_SYS_ADMIN"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -723,7 +727,8 @@
 					"CAP_SYS_CHROOT"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -758,7 +763,8 @@
 					"CAP_SYS_MODULE"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -787,7 +793,8 @@
 					"CAP_SYS_PACCT"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -824,7 +831,8 @@
 					"CAP_SYS_PTRACE"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -855,7 +863,8 @@
 					"CAP_SYS_RAWIO"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -890,7 +899,8 @@
 					"CAP_SYS_TIME"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -919,7 +929,8 @@
 					"CAP_SYS_TTY_CONFIG"
 				]
 			},
-			"errnoRet": 1
+			"errnoRet": 1,
+			"errno": "EPERM"
 		},
 		{
 			"names": [
@ -947,7 +958,8 @@
 					"CAP_AUDIT_WRITE"
 				]
 			},
-			"errnoRet": 22
+			"errnoRet": 22,
+			"errno": "EINVAL"
 		},
 		{
 			"names": [
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@ -1,4 +1,9 @@
 [aliases]
+  # almalinux
+  "almalinux" = "docker.io/library/almalinux"
+  "almalinux-minimal" = "docker.io/library/almalinux-minimal"
+  # Arch Linux
+  "archlinux" = "docker.io/archlinux/archlinux"
  # centos
  "centos" = "quay.io/centos/centos"
  # containers
@ -40,9 +45,25 @@
  "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-minimum"
+  "rhel-init" = "registry.access.redhat.com/rhel-init"
+  "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
+  "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimum"
+  "rhel7-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"
+  "ubi7/ubi" = "registry.access.redhat.com/ubi7/ubi"
+  "ubi7/ubi-minimal" = "registry.access.redhat.com/ubi7-minimal"
+  "ubi7/ubi-init" = "registry.access.redhat.com/ubi7-init"
  "ubi7" = "registry.access.redhat.com/ubi7"
  "ubi7-init" = "registry.access.redhat.com/ubi7-init"
  "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
+  "rhel8" = "registry.access.redhat.com/ubi8"
+  "rhel8-init" = "registry.access.redhat.com/ubi8-init"
+  "rhel8-minimal" = "registry.access.redhat.com/ubi8-minimal"
+  "rhel8-micro" = "registry.access.redhat.com/ubi8-micro"
  "ubi8" = "registry.access.redhat.com/ubi8"
  "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
  "ubi8-init" = "registry.access.redhat.com/ubi8-init"
@ -51,8 +72,28 @@
  "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal"
  "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init"
  "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
+  "rhel9" = "registry.access.redhat.com/ubi9"
+  "rhel9-init" = "registry.access.redhat.com/ubi9-init"
+  "rhel9-minimal" = "registry.access.redhat.com/ubi9-minimal"
+  "rhel9-micro" = "registry.access.redhat.com/ubi9-micro"
+  "ubi9" = "registry.access.redhat.com/ubi9"
+  "ubi9-minimal" = "registry.access.redhat.com/ubi9-minimal"
+  "ubi9-init" = "registry.access.redhat.com/ubi9-init"
+  "ubi9-micro" = "registry.access.redhat.com/ubi9-micro"
+  "ubi9/ubi" = "registry.access.redhat.com/ubi9/ubi"
+  "ubi9/ubi-minimal" = "registry.access.redhat.com/ubi9-minimal"
+  "ubi9/ubi-init" = "registry.access.redhat.com/ubi9-init"
+  "ubi9/ubi-micro" = "registry.access.redhat.com/ubi9-micro"
+  # Rocky Linux
+  "rockylinux" = "docker.io/library/rockylinux"
  # Debian
  "debian" = "docker.io/library/debian"
+  # Kali Linux
+  "kali-bleeding-edge" = "docker.io/kalilinux/kali-bleeding-edge"
+  "kali-dev" = "docker.io/kalilinux/kali-dev"
+  "kali-experimental" = "docker.io/kalilinux/kali-experimental"
+  "kali-last-release" = "docker.io/kalilinux/kali-last-release"
+  "kali-rolling" = "docker.io/kalilinux/kali-rolling"
  # Ubuntu
  "ubuntu" = "docker.io/library/ubuntu"
  # Oracle Linux
--- a/SOURCES/storage.conf
+++ b/SOURCES/storage.conf
@ -1,5 +1,14 @@
 # This file is is the configuration file for all tools
-# that use the containers/storage library.
+# 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
+# files.
+#
+#  Note: The storage.conf file overrides other storage.conf files based on this precedence:
+#      /usr/containers/storage.conf
+#      /etc/containers/storage.conf
+#      $HOME/.config/containers/storage.conf
+#      $XDG_CONFIG_HOME/containers/storage.conf (If XDG_CONFIG_HOME is set)
 # See man 5 containers-storage.conf for more information
 # The "container storage" table contains all of the server options.
 [storage]
@ -11,8 +20,14 @@ driver = "overlay"
 runroot = "/run/containers/storage"

 # 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
+# following commands:
+# semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH
+# restorecon -R -v /NEWSTORAGEPATH
 graphroot = "/var/lib/containers/storage"

+
 # Storage path for rootless users
 #
 # rootless_storage_path = "$HOME/.local/share/containers/storage"
--- a/SOURCES/update.sh
+++ b/SOURCES/update.sh
@ -23,17 +23,17 @@ $2 = $3" $1
 spectool -f -g containers-common.spec
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
-ensure containers.conf events_logger                 \"file\"
 if pwd | grep rhel-8 > /dev/null
 then
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"runc\"
+ensure containers.conf events_logger                 \"file\"
+ensure containers.conf log_driver                    \"k8s-file\"
+ensure containers.conf network_backend               \"cni\"
 else
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi9/pause\"
 ensure containers.conf runtime                       \"crun\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@ -4,20 +4,18 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global podman_branch main
-%global image_branch v5.16.0
-%global common_branch v0.44.2
-%global storage_branch v1.36.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: 6%{?dist}
+Release: 23%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
-BuildArch: noarch
-BuildRequires: go-md2man
+BuildRequires: /usr/bin/go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
 Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
 Requires: oci-runtime
@ -37,7 +35,7 @@ Source4: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs
 #Source5: https://raw.githubusercontent.com/containers/image/%%{image_branch}/registries.conf
 Source5: registries.conf
 Source6: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-policy.json.5.md
-Source7: https://raw.githubusercontent.com/containers/common/main/pkg/seccomp/seccomp.json
+Source7: https://raw.githubusercontent.com/containers/common/%{common_branch}/pkg/seccomp/seccomp.json
 Source8: https://raw.githubusercontent.com/containers/common/%{common_branch}/docs/containers-mounts.conf.5.md
 Source9: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-signature.5.md
 Source10: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-transports.5.md
@ -61,6 +59,18 @@ Source100: update.sh
 Source101: update-vendored.sh
 Source102: pyxis.sh

+%global aardvark_dns_version v1.0.1
+%global aardvark_dns_commit0 da6bc98b1b795d8ca4f4c77a7dbe383f5a62c6f5
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
+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.1
+%global netavark_commit0 5810f9fec619ddf3c95737f9ba26c67f43a6c88c
+%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
+Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
+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.
@ -69,11 +79,117 @@ 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: 23%{?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: 23%{?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
+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
@ -160,7 +276,89 @@ 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
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
+- update to netavark and aardvark-dns 1.0.1
+- Related: #2001445
+
+* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-22
+- build rust packages with RUSTFLAGS set to make ExecShield happy
+- Related: #2001445
+
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-21
+- 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
+- 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
+- update vendored components and configuration files
+- Related: #2001445
+
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
+- sync vendored components
+- 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
+- update shortnames from Pyxis
+- Related: #2001445
+
+* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
+- 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
+- sync vendored components
+- update shortnames from Pyxis
+- Related: #2001445
+
+* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
+- use log_driver = "journald" and events_logger = "journald" for RHEL9
+- Related: #2001445
+
+* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
+- 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
+- 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