rpms/skopeo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add initial shortnames.conf file for expanding shortnames

Browse Source
This commit is contained in:
Daniel J Walsh 2020-11-16 10:36:12 -05:00
parent 5b779794fa
commit c997166673
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
3 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
shortnames.conf Normal file
View File

@ -0,0 +1,44 @@
[aliases]
# centos
"centos" = "registry.centos.org/centos"
# containers
"skopeo" = "quay.io/skopeo/stable"
"buildah" = "quay.io/buildah/stable"
"podman" = "quay.io/podman/stable"
# docker
"alpine" = "docker.io/library/alpine"
"docker" = "docker.io/library/docker"
"registry" = "docker.io/library/registry"
"hello-world" = "docker.io/library/hello-world"
"swarm" = "docker.io/library/swarm"
# Fedora
"fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
"fedora" = "registry.fedoraproject.org/fedora"
# openSUSE
"opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
"opensuse/leap" = "registry.opensuse.org/opensuse/leap"
"opensuse/busybox" = "registry.opensuse.org/opensuse/busybox"
"tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
"leap" = "registry.opensuse.org/opensuse/leap"
"tw-busybox" = "registry.opensuse.org/opensuse/busybox"
# SUSE
"suse/sle15" = "registry.suse.com/suse/sle15"
"suse/sles12sp5" = "registry.suse.com/suse/sles12sp5"
"suse/sles12sp4" = "registry.suse.com/suse/sles12sp4"
"suse/sles12sp3" = "registry.suse.com/suse/sles12sp3"
"sle15" = "registry.suse.com/suse/sle15"
"sles12sp5" = "registry.suse.com/suse/sles12sp5"
"sles12sp4" = "registry.suse.com/suse/sles12sp4"
"sles12sp3" = "registry.suse.com/suse/sles12sp3"
# Red Hat Enterprise Linux
"rhel" = "registry.access.redhat.com/rhel"
"rhel6" = "registry.access.redhat.com/rhel6"
"rhel7" = "registry.access.redhat.com/rhel7"
"ubi7" = "registry.access.redhat.com/ubi7"
"ubi7-init" = "registry.access.redhat.com/ubi7-init"
"ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
"ubi8" = "registry.access.redhat.com/ubi8"
"ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
"ubi8-init" = "registry.access.redhat.com/ubi8-init"
# Debian
"debian" = "docker.io/library/debian"

11
skopeo.spec
View File

@ -46,7 +46,7 @@ Epoch: 1
Epoch: 2
%endif
Version: 1.2.1
Release: 20.dev.git%{shortcommit0}%{?dist}
Release: 21.dev.git%{shortcommit0}%{?dist}
Summary: Inspect container images and repositories on registries
License: ASL 2.0
URL: %{git0}
@ -67,6 +67,7 @@ Source13: containers.conf
Source14: containers.conf.5.md
Source15: containers-auth.json.5.md
Source16: containers-registries.conf.d.5.md
Source17: shortnames.conf
%if 0%{?fedora}
BuildRequires: go-srpm-macros
@ -325,9 +326,10 @@ make \
DESTDIR=%{buildroot} \
SIGSTOREDIR=%{buildroot}%{_sharedstatedir}/containers/sigstore \
install
install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d}
install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.d}
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.d/shortnames.conf
install -dp %{buildroot}%{_mandir}/man5
go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5
@ -419,10 +421,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%dir %{_sysconfdir}/containers/registries.d
%dir %{_sysconfdir}/containers/oci
%dir %{_sysconfdir}/containers/oci/hooks.d
%dir %{_sysconfdir}/containers/registries.d
%config(noreplace) %{_sysconfdir}/containers/policy.json
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
%config(noreplace) %{_sysconfdir}/containers/storage.conf
%config(noreplace) %{_sysconfdir}/containers/registries.conf
%config(noreplace) %{_sysconfdir}/containers/registries.d/shortnames.conf
%ghost %{_sysconfdir}/containers/containers.conf
%dir %{_sharedstatedir}/containers/sigstore
%{_mandir}/man5/*
@ -449,6 +453,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/%{name}/test
%changelog
* Mon Nov 16 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.1-21.dev.git1a3ae14
- Add initial shortnames.conf file for expanding shortnames
* Mon Nov 16 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.2.1-20.dev.git1a3ae14
- Update man pages and storage.conf
- Add update.sh to make getting man pages and configuration files easier

9
update.sh
View File

@ -3,18 +3,22 @@ clone() {
pushd $1
git config pull.rebase false
git pull origin master
git pull origin main
popd
}
#!/bin/sh
# checkout containers/storage and get man pages and storage.conf
clone storage
sed -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' storage/storage.conf > storage.conf
cp storage/docs/containers-storage.conf.5.md .
# checkout containers/image and get man pages and registries.conf
clone image
cp image/docs/*md .
sed -e 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]/g' image/registries.conf > registries.conf
rm signature-protocols.md
# checkout containers/common and get man pages, seccomp.json and containers.conf
clone common
cp common/docs/*md .
cp common/pkg/config/containers.conf .
@ -24,5 +28,10 @@ sed -e '/\"kill\",/i \
"socket",' common/pkg/seccomp/seccomp.json > seccomp.json
sed -e 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]/g' image/registries.conf > registries.conf
# checkout containers/podman and get mounts.conf man page
clone podman
cp podman/docs/source/markdown/containers-mounts.conf.5.md .
# checkout containers/shortnames and get shortnames.conf man page
clone shortnames
cp shortnames/shortnames.conf .