6 changed files with 291 additions and 220 deletions
--- a/SOURCES/Containerfile.5.md
+++ b/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 .
  ```

@ -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

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

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

+	      · 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:
@ -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
--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@ -57,19 +57,20 @@
 # 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 = [
-#  "CHOWN",
-#  "DAC_OVERRIDE",
-#  "FOWNER",
-#  "FSETID",
-#  "KILL",
-#  "NET_BIND_SERVICE",
-#  "SETFCAP",
-#  "SETGID",
-#  "SETPCAP",
-#  "SETUID",
-#  "SYS_CHROOT",
-#]
+default_capabilities = [
+  "NET_RAW",
+  "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",
@ -184,6 +185,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
@ -320,6 +322,7 @@ default_sysctls = [
 # 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.
 #
@ -505,6 +508,7 @@ default_sysctls = [
 # 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.
@ -642,7 +646,7 @@ default_sysctls = [
 # Default OCI runtime
 #
 #runtime = "crun"
-runtime = "crun"
+runtime = "runc"

 # List of the OCI runtimes that support --format=json. When json is supported
 # engine will use it for reporting nicer errors.
@ -730,6 +734,15 @@ runtime = "crun"
 #  "/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",
--- a/SOURCES/containers.conf.5.md
+++ b/SOURCES/containers.conf.5.md
@ -753,9 +753,9 @@ Indicates whether the application should be running in remote mode. This flag mo

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

--- a/SOURCES/registries.conf
+++ b/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 = "enforcing"
+short-name-mode = "permissive"
--- a/SOURCES/shortnames.conf
+++ b/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
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@ -4,17 +4,19 @@
 # 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 image_branch v5.29.3
+%global common_branch v0.57.5
 %global storage_branch v1.51.0
 %global shortnames_branch main

 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 91%{?dist}
+Release: 82%{?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}
@ -173,268 +175,260 @@ EOF
 %{_datadir}/rhel/secrets/*

 %changelog
-* Wed Apr 17 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-91
- rebuild for the wrong tag
- Related: RHEL-31946
+* Wed Jul 17 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-82
+- update vendored components 
+- Resolves: RHEL-40801
+
+* Wed Feb 14 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-81
+- Update shortnames from Pyxis
+- 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-31946
+* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-80
+- bump release to preserve upgrade path
+- Resolves: Jira:RHEL-12277

-* Wed Feb 14 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-62
- regenerate shortnames from Pyxis and update vendored components
- Related: Jira:RHEL-2112
+* Thu Feb 08 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-59
+- update vendored components
+- Related: Jira:RHEL-2110

-* Thu Feb 08 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-61
+* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-58
 - update vendored components
- Related: Jira:RHEL-2112
+- Related: Jira:RHEL-2110

-* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 2:1-60
- Update vendored components
- Related: Jira:RHEL-2112
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1-57
+- Rebuilt for MSVSphere 8.8

-* Wed Oct 11 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-59
- fix shortnames
- 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

-* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-58
+* Fri Sep 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-56
 - implement GPG auto updating mechanism from redhat-release
- Resolves: #RHEL-3164
+- Resolves: #RHEL-2110

-* Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-57
+* Wed Sep 13 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
 - update GPG keys to the current content of redhat-release
 - Resolves: #RHEL-3164

-* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-56
+* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
 - update vendored components and shortnames
- Related: #2176063
-
-* Wed Jul 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
- fix vendoring script
- Related: #2176063
+- Related: #2176055

-* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-54
+* Mon Jul 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-53
 - update vendored components
- Related: #2176063
+- Related: #2176055

-* 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
+* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-52
 - update vendored components
- Related: #2176063
+- Related: #2176055

-* Fri Mar 24 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-51
- regenerate shortnames, vendored components + fix pyxis script
- Related: #2176063
+* Tue Mar 21 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-51
+- be sure default_capabilities contain SYS_CHROOT
+- Resolves: #2166195

-* Wed Feb 22 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-50
+* Thu Mar 09 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-50
 - improve shortnames generation
- Related: #2124478
+- Related: #2176055

-* Tue Jan 31 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-49
- add missing systemd directories
- Related: #2124478
+* Mon Jan 02 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-49
+- update vendored components and configuration files
+- Related: #2123641

-* Mon Jan 30 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-48
+* Fri Dec 02 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-48
 - update vendored components and configuration files
- Related: #2124478
+- Related: #2123641

-* Thu Jan 05 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-47
- update vendored components, regenerate pyxis
- Related: #2124478
+* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-47
+- enable NET_RAW capability for RHEL8 only
+- 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
+* Tue Nov 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-46
+- update vendored components and configuration files
+- Related: #2123641

 * Fri Oct 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-45
- add beta GPG key
- Related: #2124478
+- update vendored components and configuration files
+- Related: #2123641

-* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-44
- exclude non-go arches because of go-md2man
- Related: #2061316
+* 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 Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-43
+* Tue Sep 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-41
+- add beta GPG key
+- Related: #2123641
+
+* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
 - add beta keys to default-policy.json
- Related: #2061316
+- Related: #2061390

-* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-42
+* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
 - update shortnames
- Related: #2061316
+- Related: #2061390
+
+* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
+- arch limitation because of go-md2man (missing on i686)
+- Related: #2061390

-* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-41
- drop aardvark-dns and netavark - packaged separately
+* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
+- add install section
 - update vendored components
- Related: #2061316
+- 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

-* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
+* 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
 - remove rhel-els and update shortnames
- Related: #2061316
+- Related: #2061390

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

-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
- fix unqualified registries in registries.conf generation code
- Related: #2088139
+* 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

-* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
+* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-29
 - update unqualified registries list
- Related: #2088139
+- Related: #2061390

-* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
+* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
 - update aardvark-dns and netavark to 1.0.3
 - update vendored components
- Related: #2061316
+- Related: #2061390

-* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
+* Fri Apr 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-27
+- add man page sources too
+- Related: #2061390
+
+* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
 - add missing man pages from Fedora
- Related: #2061316
+- Related: #2061390
+
+* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-25
+- allow consuming aardvark-dns and netavark from upstream branch
+- Related: #2061390

-* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
+* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
 - update to netavark and aardvark-dns 1.0.2
 - update vendored components
- 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
+- Related: #2061390

-* 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
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
 - update to netavark and aardvark-dns 1.0.1
- Related: #2000051
-
-* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-30
- archful package should conflict with older noarch package
- Related: #2000051
+- Related: #2001445

-* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-29
- consistent release tags for all packages
- 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-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
+* 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: #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
+- Related: #2001445

-* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
+* 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: #2000051
+- Related: #2001445

-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
 - package aarvark-dns and netavark as part of the containers-common
- Related: #2000051
+- Related: #2001445

-* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-22
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
 - update shortnames and vendored components
- Related: #2000051
+- Related: #2001445

-* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-21
+* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
 - containers.conf should contain network_backend = "cni" in RHEL8.6
- Related: #2000051
+- Related: #2001445

-* Wed Feb 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-20
- update shortname aliases from upstream
- Related: #2000051
+* 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-19
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
 - sync vendored components
- Related: #2000051
+- Related: #2001445

-* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-14
 - sync vendored components
- Related: #2000051
-
-* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
- sync shortname aliases via Pyxis
- Related: #2000051
+- 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
+* 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-15
+* 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: #2000051
+- 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 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
+- sync vendored components
+- update shortnames from Pyxis
+- Related: #2001445

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

-* Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
+* 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: #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
+- Related: #2001445

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

-* Tue Nov 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
+* Tue Nov 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
 - make log_driver = "k8s-file" default in containers.conf
- Related: #2000051
+- Related: #2001445

-* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-8
- perform only sanity/installability tests for now
- Related: #2000051
+* Wed Oct 13 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-6
+- sync vendored components
+- Related: #2001445

-* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-5
 - update to the new vendored components
- Related: #2000051
+- Related: #2001445

-* 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
+* Fri Sep 24 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
 - update to the new vendored components
- Related: #2000051
-
-* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
- fix updating scripts
- Related: #2000051
+- Related: #2001445

-* Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
 - update to the new vendored components
- Related: #2000051
+- Related: #2001445

-* 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-2
+- synchronize config files for RHEL-8.5
+- Related: #1934415

 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-1
 - initial import
- Related: #1970747
+- Related: #1934415