From b6577062543cfd62de69c9ebe0e51bf7ab4a4ce6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 2 Apr 2018 17:00:20 -0400 Subject: [PATCH] Add registries.conf man page --- registries.conf.5.md | 41 +++++++++++++++++++++++++++++++++++++++++ skopeo.spec | 9 +++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 registries.conf.5.md diff --git a/registries.conf.5.md b/registries.conf.5.md new file mode 100644 index 0000000..3aa4ad5 --- /dev/null +++ b/registries.conf.5.md @@ -0,0 +1,41 @@ +% registries.conf(5) System-wide registry configuration file +% Brent Baude +% Aug 2017 + +# NAME +registries.conf - Syntax of System Registry Configuration File + +# DESCRIPTION +The REGISTRIES configuration file is a system-wide configuration file for container image +registries. The file format is TOML. + +# FORMAT +The TOML_format is used to build simple list format for registries under two +categories: `search` and `insecure`. You can list multiple registries using +as 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. + +Insecure Registries. By default container runtimes use TLS when retrieving images +from a registry. If the registry is not setup with TLS, then the container runtime +will fail to pull images from the registry. If you add the registry to the list of +insecure registries then the container runtime will attempt use standard web protocols to +pull the image. It also allows you to pull from a registry with self-signed certificates. +Note insecure registries can be used for any registry, not just the +registries listed under search. + +The following example configuration defines two searchable registries and one +insecure registry. + +``` +[registries.search] +registries = ["registry1.com", "registry2.com"] + +[registries.insecure] +registries = ["registry3.com"] +``` + +# HISTORY +Aug 2017, Originally compiled by Brent Baude diff --git a/skopeo.spec b/skopeo.spec index 84b109b..96a7342 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -38,7 +38,7 @@ Name: %{repo} Epoch: 1 %endif # centos Version: 0.1.29 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Inspect Docker images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -46,6 +46,7 @@ Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source1: storage.conf Source2: containers-storage.conf.5.md Source3: mounts.conf +Source4: registries.conf.5.md %if 0%{?fedora} BuildRequires: go-srpm-macros @@ -215,6 +216,7 @@ mkdir -p %{buildroot}%{_sysconfdir} install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf mkdir -p %{buildroot}%{_mandir}/man5 go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5 +go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/registries.conf.5 mkdir -p %{buildroot}%{_datadir}/containers install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/containers/mounts.conf @@ -288,7 +290,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/containers/storage.conf %dir %{_sharedstatedir}/atomic/sigstore -%{_mandir}/man5/containers-storage.conf.5* +%{_mandir}/man5/* %dir %{_datadir}/containers %{_datadir}/containers/mounts.conf %dir %{_datadir}/rhel/secrets @@ -306,6 +308,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Apr 2 2018 dwalsh - 0.1.29-2.git +- Add registries.conf man page + * Thu Mar 29 2018 dwalsh - 0.1.29-1.git - bump to 0.1.29-1 - Updated containers/image