Update to grab latest man pages and configuration files

containers-common.spec

@@ -16,7 +16,7 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 36%{?dist}
+Release: 37%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -162,6 +162,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Mon Dec 20 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-37
+- Update to grab latest man pages and configuration files
+
 * Mon Nov 29 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-36
 - Update to grab latest man pages and configuration files
 - Move /etc/containers/containers.conf to /usr/share/containers/containers.conf

containers.conf

@@ -294,6 +294,12 @@ log_driver = "journald"
 #
 #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"
 #
@@ -581,6 +587,11 @@ log_driver = "journald"
 #
 #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

containers.conf.5.md

@@ -567,6 +567,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.
 
@@ -617,15 +621,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**

shortnames.conf

@@ -54,8 +54,16 @@
   "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"
+  # 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