From e6a15e0edd6225b54cdcfd77d78a5403050aa77f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 1 May 2020 13:40:30 -0400 Subject: [PATCH] Fix containers-registries.conf.5 man page to match upstream --- containers-registries.conf.5.md | 35 +++++++++++++++++++++++++++++++-- skopeo.spec | 5 ++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/containers-registries.conf.5.md b/containers-registries.conf.5.md index f0542ba..8cfa995 100644 --- a/containers-registries.conf.5.md +++ b/containers-registries.conf.5.md @@ -11,8 +11,6 @@ file for container image registries. The file format is TOML. Container engines will use the `$HOME/.config/containers/registries.conf` if it exists, otherwise they will use `/etc/containers/registries.conf` -# FORMATS - ### GLOBAL SETTINGS `unqualified-search-registries` @@ -149,6 +147,39 @@ Given the above, a pull of `example.com/foo/image:latest` will try: in order, and use the first one that exists. +## VERSION 1 FORMAT - DEPRECATED +VERSION 1 format is still supported but it does not support +using registry mirrors, longest-prefix matches, or location rewriting. + +The TOML format is used to build a simple list of registries under three +categories: `registries.search`, `registries.insecure`, and `registries.block`. +You can list multiple registries using a comma separated list. + +Search registries are used when the caller of a container runtime does not fully specify the +container image that they want to execute. These registries are prepended onto the front +of the specified container image until the named image is found at a registry. + +Note that insecure registries can be used for any registry, not just the registries listed +under search. + +The `registries.insecure` and `registries.block` lists have the same meaning as the +`insecure` and `blocked` fields in the current version. + +### EXAMPLE +The following example configuration defines two searchable registries, one +insecure registry, and two blocked registries. + +``` +[registries.search] +registries = ['registry1.com', 'registry2.com'] + +[registries.insecure] +registries = ['registry3.com'] + +[registries.block] +registries = ['registry.untrusted.com', 'registry.unsafe.com'] +``` + # NOTE: RISK OF USING UNQUALIFIED IMAGE NAMES We recommend always using fully qualified image names including the registry server (full dns name), namespace, image name, and tag diff --git a/skopeo.spec b/skopeo.spec index 6af2bae..9f69df2 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -46,7 +46,7 @@ Epoch: 1 Epoch: 2 %endif Version: 0.2.0 -Release: 0.4.dev.git%{shortcommit0}%{?dist} +Release: 0.5.dev.git%{shortcommit0}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -436,6 +436,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Fri May 1 2020 Dan Walsh - 1:0.2.0-0.5.dev.git2415f3f +- Fix containers-registries.conf.5 man page to match upstream + * Wed Apr 29 2020 Dan Walsh - 1:0.2.0-0.4.dev.git2415f3f - Fix registries.conf file to correctly pass the unqualified-search-registries