Update to grab latest man pages and configuration files

containers-auth.json.5.md

@@ -21,14 +21,15 @@ Except the primary (read/write) file, other files are read-only, unless the user
 The auth.json file stores encrypted authentication information for the
 user to container image registries.  The file can have zero to many entries and
 is created by a `login` command from a container tool such as `podman login`,
-`buildah login` or `skopeo login`.  Each entry includes the name of the registry and then an auth
+`buildah login` or `skopeo login`. Each entry either contains a single
-token in the form of a base64 encoded string from the concatenation of the
+hostname (e.g. `docker.io`) or a namespace (e.g. `quay.io/user/image`) as a key
-username, a colon, and the password. The registry name can additionally contain
+and an auth token in the form of a base64 encoded string as value of `auth`. The
-a path or repository name (an image name without tag or digest). The path (or
+token is built from the concatenation of the username, a colon, and the
-namespace) is matched in its hierarchical order when checking for available
+password. The registry name can additionally contain a repository name (an image
-authentications. For example, an image pull for
+name without tag or digest) and namespaces. The path (or namespace) is matched
-`my-registry.local/namespace/user/image:latest` will result in a lookup in
+in its hierarchical order when checking for available authentications. For
-`auth.json` in the following order:
+example, an image pull for `my-registry.local/namespace/user/image:latest` will
+result in a lookup in `auth.json` in the following order:
 
 - `my-registry.local/namespace/user/image`
 - `my-registry.local/namespace/user`

containers-common.spec

@@ -15,7 +15,7 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -150,6 +150,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Thu Aug 12 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-25
+- Update to grab latest man pages and configuration files
+
 * Mon Jul 26 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-24
 - Add support for signed RHEL images, enabled by default
 

containers-storage.conf.5.md

@@ -174,6 +174,9 @@ The `storage.options.overlay` table supports the following options:
 **ignore_chown_errors** = "false"
   ignore_chown_errors can be set to allow a non privileged user running with a  single UID within a user namespace to run containers. The user can pull and use any image even those with multiple uids.  Note multiple UIDs will be squashed down to the default uid in the container.  These images will have no separation between the users in the container. (default: false)
 
+**inodes**=""
+  Maximum inodes in a read/write layer.   This flag can be used to set a quota on the inodes allocated for a read/write layer of a container.
+
 **force_mask** = "0000|shared|private"
   ForceMask specifies the permissions mask that is used for new files and
 directories.
@@ -220,7 +223,7 @@ based file systems.
   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))
+  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))
 
 ### STORAGE OPTIONS FOR VFS TABLE
 
@@ -260,13 +263,45 @@ The semanage command above tells SELinux to setup the default labeling of `NEWST
 
 Now all new content created in these directories will automatically be created with the correct label.
 
-## SEE ALSO
+## QUOTAS
-`semanage(8)`, `restorecon(8)`, `mount(8)`, `fuse-overlayfs(1)`
+
+Container storage implements `XFS project quota controls` for overlay storage
+containers and volumes. The directory used to store the containers must be an
+`XFS` file system and be mounted with the `pquota` option.
+
+Example /etc/fstab entry:
+```
+/dev/podman/podman-var /var xfs defaults,x-systemd.device-timeout=0,pquota 1 2
+```
+
+Container storage generates project ids for each container and builtin volume, but these project ids need to be unique for the XFS file system.
+
+The xfs_quota tool can be used to assign a project id to the storage driver directory, e.g.:
+
+```
+echo 100000:/var/lib/containers/storage/overlay >> /etc/projects
+echo 200000:/var/lib/containers/storage/volumes >> /etc/projects
+echo storage:100000 >> /etc/projid
+echo volumes:200000 >> /etc/projid
+xfs_quota -x -c 'project -s storage volumes' /<xfs mount point>
+```
+
+In the example above, the storage directory project id will be used as a "start offset"
+and all containers will be assigned larger project ids (e.g. >= 100000).
+Then the volumes directory project id will be used as a "start offset"
+and all volumes will be assigned larger project ids (e.g. >= 200000).
+This is a way to prevent xfs_quota management from conflicting with containers/storage.
 
 ## 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.
 
+/etc/projects - XFS persistent project root definition
+/etc/projid -  XFS project name mapping file
+
+## SEE ALSO
+`semanage(8)`, `restorecon(8)`, `mount(8)`, `fuse-overlayfs(1)`, `xfs_quota(8)`, `projects(5)`, `projid(5)`
+
 ## HISTORY
 May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
 Format copied from crio.conf man page created by Aleksa Sarai <asarai@suse.de>

containers.conf

@@ -140,6 +140,7 @@ default_sysctls = [
 
 # keyring tells the container engine whether to create
 # a kernel keyring for use within the container.
+#
 #keyring = true
 
 # label tells the container engine whether to use container separation using
@@ -197,6 +198,7 @@ log_driver = "journald"
 #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
@@ -263,12 +265,14 @@ log_driver = "journald"
 #cni_plugin_dirs = ["/usr/libexec/cni"]
 
 # The network name of the default CNI network to attach pods to.
+#
 #default_network = "podman"
 
 # The default subnet for the default CNI 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.
@@ -277,6 +281,7 @@ log_driver = "journald"
 
 [engine]
 # Index to the active service
+#
 #active_service = production
 
 # Cgroup management implementation used for the runtime.
@@ -322,6 +327,7 @@ log_driver = "journald"
 # 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.
+#
 #env = []
 
 # Selects which logging mechanism to use for container engine events.
@@ -338,6 +344,7 @@ log_driver = "journald"
 # 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.
+#
 #image_default_format = ""
 
 # Default transport method for pulling and pushing for images
@@ -346,6 +353,7 @@ log_driver = "journald"
 
 # Maximum number of image layers to be copied (pulled/pushed) simultaneously.
 # Not setting this field, or setting it to zero, will fall back to containers/image defaults.
+#
 #image_parallel_copies = 0
 
 # Default command to run the infra container
@@ -370,8 +378,13 @@ log_driver = "journald"
 # Indicates if Podman is running inside a VM via Podman Machine.
 # Podman uses this value to do extra setup around networking from the
 # container inside the VM to to host.
+#
 #machine_enabled = false
 
+# The image used when creating a podman-machine VM.
+#
+#machine_image = "testing"
+
 # MultiImageArchive - if true, the container engine allows for storing archives
 # (e.g., of the docker-archive transport) with multiple images.  By default,
 # Podman creates single-image archives.
@@ -407,11 +420,13 @@ log_driver = "journald"
 #num_locks = 2048
 
 # Whether to pull new image before running a container
+#
 #pull_policy = "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.
+#
 #remote = false
 
 # Default OCI runtime
@@ -439,9 +454,11 @@ log_driver = "journald"
 #static_dir = "/var/lib/containers/storage/libpod"
 
 # Number of seconds to wait for container to exit before sending kill signal.
+#
 #stop_timeout = 10
 
 # map of service destinations
+#
 #[service_destinations]
 #  [service_destinations.production]
 #     URI to access the Podman service
@@ -450,6 +467,7 @@ log_driver = "journald"
 #       rootfull "unix://run/podman/podman.sock (Default)
 #       remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
 #       remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
+#
 #    uri = "ssh://user@production.example.com/run/user/1001/podman/podman.sock"
 #    Path to file containing ssh identity key
 #    identity = "~/.ssh/id_rsa"

containers.conf.5.md

@@ -412,6 +412,11 @@ Indicates if Podman is running inside a VM via Podman Machine.
 Podman uses this value to do extra setup around networking from the
 container inside the VM to to host.
 
+**machine_image**="testing"
+
+Default image used when creating a new VM using `podman machine init`.
+Options: `testing`, `stable`, or a custom path or download URL to an image
+
 **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.

shortnames.conf

@@ -56,7 +56,7 @@
   # Ubuntu
   "ubuntu" = "docker.io/library/ubuntu"
   # Oracle Linux
-  "oraclelinux" = "docker.io/library/oraclelinux"
+  "oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
   # busybox
   "busybox" = "docker.io/library/busybox"
   # php

storage.conf

@@ -69,6 +69,9 @@ additionalimagestores = [
 # and vfs drivers.
 #ignore_chown_errors = "false"
 
+# Inodes is used to set a maximum inodes of the container image.
+# inodes = ""
+
 # Path to an helper program to use for mounting the file system instead of mounting it
 # directly.
 #mount_program = "/usr/bin/fuse-overlayfs"