containers-common-4:1-15

- pull latest files from upstream

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

containers-certs.d.5.md

@@ -15,7 +15,7 @@ A certs directory can contain one or more files with the following extensions:
 * `*.key`  files with this extensions will be interpreted as client keys
 
 Note that the client certificate-key pair will be selected by the file name (e.g., `client.{cert,key}`).
-An examplary setup for a registry running at `my-registry.com:5000` may look as follows:
+An exemplary setup for a registry running at `my-registry.com:5000` may look as follows:
 ```
 /etc/containers/certs.d/    <- Certificate directory
 └── my-registry.com:5000    <- Hostname:port

containers-common.spec

@@ -15,7 +15,7 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -115,6 +115,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Fri Apr 09 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-15
+- pull latest files from upstream
+
 * Fri Mar 19 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-14
 - also provide skopeo-containers
 - bump release tag for smooth upgrade from f34

containers-policy.json.5.md

@@ -114,7 +114,7 @@ Scopes are ignored.
 
 Using the mechanisms above, a set of policy requirements is looked up.  The policy requirements
 are represented as a JSON array of individual requirement objects.  For an image to be accepted,
-*all* of the requirements must be satisfied simulatenously.
+*all* of the requirements must be satisfied simultaneously.
 
 The policy requirements can also be used to decide whether an individual signature is accepted (= is signed by a recognized key of a known author);
 in that case some requirements may apply only to some signatures, but each signature must be accepted by *at least one* requirement object.

containers-registries.conf.5.md

@@ -16,6 +16,9 @@ Container engines will use the `$HOME/.config/containers/registries.conf` if it
 `unqualified-search-registries`
 : An array of _host_[`:`_port_] registries to try when pulling an unqualified image, in order.
 
+`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.
+
 ### NAMESPACED `[[registry]]` SETTINGS
 
 The bulk of the configuration is represented as an array of `[[registry]]`
@@ -270,7 +273,7 @@ the destination registry is unambiguous. Pulling by digest
 tags.
 
 # SEE ALSO
-  containers-certs.d(5)
+ containers-auth.json(5) containers-certs.d(5)
 
 # HISTORY
 Dec 2019, Warning added for unqualified image names by Tom Sweeney <tsweeney@redhat.com>

shortnames.conf

@@ -51,5 +51,11 @@
   "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
   # Debian
   "debian" = "docker.io/library/debian"
+  # Ubuntu
+  "ubuntu" = "docker.io/library/ubuntu"
   # Oracle Linux
   "oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
+  # busybox
+  "busybox" = "docker.io/library/busybox"
+  # php
+  "php" = "docker.io/library/php"