2021-01-12 16:15:47 +00:00
|
|
|
# Below definitions are used to deliver config files from a particular branch
|
|
|
|
|
# of c/image, c/common, c/storage vendored in all of Buildah, Podman and Skopeo.
|
2020-12-14 10:09:08 +00:00
|
|
|
# These vendored components must have the same version. If it is not the case,
|
|
|
|
|
# pick the oldest version on c/image, c/common, c/storage vendored in
|
2021-01-12 16:15:47 +00:00
|
|
|
# Buildah/Podman/Skopeo.
|
2020-12-14 10:09:08 +00:00
|
|
|
%global skopeo_branch master
|
|
|
|
|
%global podman_branch master
|
|
|
|
|
%global image_branch master
|
2021-06-10 12:50:45 +00:00
|
|
|
%global common_branch main
|
|
|
|
|
%global storage_branch main
|
|
|
|
|
%global shortnames_branch main
|
2021-01-12 15:24:12 +00:00
|
|
|
|
|
|
|
|
%global github_containers https://raw.githubusercontent.com/containers
|
2020-12-14 10:09:08 +00:00
|
|
|
|
2021-01-12 16:15:47 +00:00
|
|
|
Epoch: 4
|
2020-12-14 10:09:08 +00:00
|
|
|
Name: containers-common
|
2021-01-20 20:16:15 +00:00
|
|
|
Version: 1
|
2021-06-10 12:50:45 +00:00
|
|
|
Release: 19%{?dist}
|
2020-12-14 10:09:08 +00:00
|
|
|
Summary: Common configuration and documentation for containers
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
BuildRequires: go-md2man
|
2021-03-19 14:19:00 +00:00
|
|
|
Provides: skopeo-containers = %{epoch}:%{version}-%{release}
|
2021-05-18 15:53:01 +00:00
|
|
|
Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
|
2021-04-15 20:08:36 +00:00
|
|
|
Requires: oci-runtime
|
2020-12-14 10:09:08 +00:00
|
|
|
Recommends: fuse-overlayfs
|
|
|
|
|
Recommends: slirp4netns
|
2021-01-28 16:04:13 +00:00
|
|
|
Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
|
|
|
|
|
Source2: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
|
|
|
|
|
Source3: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
|
|
|
|
|
Source4: %{github_containers}/common/%{common_branch}/pkg/subscriptions/mounts.conf
|
|
|
|
|
Source5: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
|
|
|
|
|
Source6: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
|
2021-01-28 14:55:19 +00:00
|
|
|
Source7: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
|
2021-01-28 16:04:13 +00:00
|
|
|
Source8: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
|
|
|
|
|
Source9: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
|
|
|
|
|
Source10: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
|
|
|
|
|
Source11: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
|
|
|
|
|
Source12: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
|
|
|
|
|
Source13: %{github_containers}/image/%{image_branch}/registries.conf
|
2021-06-10 12:50:45 +00:00
|
|
|
Source14: %{github_containers}/common/%{common_branch}/docs/containers-mounts.conf.5.md
|
2021-01-28 14:55:19 +00:00
|
|
|
Source15: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
|
2021-01-28 16:04:13 +00:00
|
|
|
Source16: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
|
2021-02-01 19:13:20 +00:00
|
|
|
Source17: %{github_containers}/skopeo/%{skopeo_branch}/default-policy.json
|
2021-01-28 16:04:13 +00:00
|
|
|
Source18: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
|
|
|
|
|
Source19: %{github_containers}/storage/%{storage_branch}/storage.conf
|
2020-12-14 10:09:08 +00:00
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
This package contains common configuration files and documentation for container
|
2021-01-12 15:24:12 +00:00
|
|
|
tools ecosystem, such as Podman, Buildah and Skopeo.
|
2020-12-14 10:09:08 +00:00
|
|
|
|
|
|
|
|
It is required because the most of configuration files and docs come from projects
|
2021-01-12 15:24:12 +00:00
|
|
|
which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged
|
2020-12-14 10:09:08 +00:00
|
|
|
separately.
|
|
|
|
|
|
|
|
|
|
%prep
|
2021-04-12 12:59:58 +00:00
|
|
|
cp %{SOURCE1} .
|
|
|
|
|
cp %{SOURCE2} .
|
|
|
|
|
cp %{SOURCE3} .
|
|
|
|
|
cp %{SOURCE4} .
|
|
|
|
|
cp %{SOURCE5} .
|
|
|
|
|
cp %{SOURCE6} .
|
|
|
|
|
cp %{SOURCE7} .
|
|
|
|
|
cp %{SOURCE8} .
|
|
|
|
|
cp %{SOURCE9} .
|
|
|
|
|
cp %{SOURCE10} .
|
|
|
|
|
cp %{SOURCE11} .
|
|
|
|
|
cp %{SOURCE12} .
|
|
|
|
|
cp %{SOURCE13} .
|
|
|
|
|
cp %{SOURCE14} .
|
|
|
|
|
cp %{SOURCE15} .
|
|
|
|
|
cp %{SOURCE16} .
|
|
|
|
|
cp %{SOURCE17} .
|
|
|
|
|
cp %{SOURCE18} .
|
|
|
|
|
cp %{SOURCE19} .
|
2020-12-14 10:09:08 +00:00
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
|
|
|
|
|
%install
|
2021-01-13 01:22:23 +00:00
|
|
|
# install config and policy files for registries
|
2021-01-12 15:24:12 +00:00
|
|
|
install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.conf.d,registries.d}
|
2020-12-14 10:09:08 +00:00
|
|
|
install -dp %{buildroot}%{_sharedstatedir}/containers/sigstore
|
2021-04-12 12:59:58 +00:00
|
|
|
install -m0644 default.yaml %{buildroot}%{_sysconfdir}/containers/registries.d/default.yaml
|
|
|
|
|
install -m0644 storage.conf %{buildroot}%{_sysconfdir}/containers/storage.conf
|
|
|
|
|
install -m0644 registries.conf %{buildroot}%{_sysconfdir}/containers/registries.conf
|
|
|
|
|
install -m0644 shortnames.conf %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
|
|
|
|
|
install -m0644 default-policy.json %{buildroot}%{_sysconfdir}/containers/policy.json
|
2020-12-14 10:09:08 +00:00
|
|
|
|
2021-01-13 01:22:23 +00:00
|
|
|
# install manpages
|
|
|
|
|
install -dp %{buildroot}%{_mandir}/man5
|
2021-04-12 12:59:58 +00:00
|
|
|
go-md2man -in containers-storage.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
|
|
|
|
|
go-md2man -in containers-registries.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5
|
|
|
|
|
go-md2man -in containers-policy.json.5.md -out %{buildroot}%{_mandir}/man5/containers-policy.json.5
|
|
|
|
|
go-md2man -in containers-mounts.conf.5.md -out %{buildroot}%{_mandir}/man5/containers-mounts.conf.5
|
|
|
|
|
go-md2man -in containers-signature.5.md -out %{buildroot}%{_mandir}/man5/containers-signature.5
|
|
|
|
|
go-md2man -in containers-transports.5.md -out %{buildroot}%{_mandir}/man5/containers-transports.5
|
|
|
|
|
go-md2man -in containers-certs.d.5.md -out %{buildroot}%{_mandir}/man5/containers-certs.d.5
|
|
|
|
|
go-md2man -in containers-registries.d.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.d.5
|
|
|
|
|
go-md2man -in containers.conf.5.md -out %{buildroot}%{_mandir}/man5/containers.conf.5
|
|
|
|
|
go-md2man -in containers-auth.json.5.md -out %{buildroot}%{_mandir}/man5/containers-auth.json.5
|
|
|
|
|
go-md2man -in containers-registries.conf.d.5.md -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5
|
2021-01-13 01:22:23 +00:00
|
|
|
|
|
|
|
|
# install config files for mounts, containers and seccomp
|
2020-12-14 10:09:08 +00:00
|
|
|
install -dp %{buildroot}%{_datadir}/containers
|
2021-04-12 12:59:58 +00:00
|
|
|
install -m0644 mounts.conf %{buildroot}%{_datadir}/containers/mounts.conf
|
|
|
|
|
install -m0644 seccomp.json %{buildroot}%{_datadir}/containers/seccomp.json
|
|
|
|
|
install -m0644 containers.conf %{buildroot}%{_datadir}/containers/containers.conf
|
2020-12-14 10:09:08 +00:00
|
|
|
|
|
|
|
|
# install secrets patch directory
|
|
|
|
|
install -d -p -m 755 %{buildroot}/%{_datadir}/rhel/secrets
|
|
|
|
|
# rhbz#1110876 - update symlinks for subscription management
|
|
|
|
|
ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
|
|
|
|
|
ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
|
|
|
|
|
ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%dir %{_sysconfdir}/containers
|
|
|
|
|
%dir %{_sysconfdir}/containers/certs.d
|
|
|
|
|
%dir %{_sysconfdir}/containers/oci
|
|
|
|
|
%dir %{_sysconfdir}/containers/oci/hooks.d
|
2021-01-28 14:55:19 +00:00
|
|
|
%dir %{_sysconfdir}/containers/registries.conf.d
|
|
|
|
|
%dir %{_sysconfdir}/containers/registries.d
|
2020-12-14 10:09:08 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/containers/policy.json
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/containers/registries.conf
|
2021-02-18 15:19:40 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
|
2021-01-28 14:55:19 +00:00
|
|
|
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
|
|
|
|
|
%config(noreplace) %{_sysconfdir}/containers/storage.conf
|
2020-12-14 10:09:08 +00:00
|
|
|
%ghost %{_sysconfdir}/containers/containers.conf
|
|
|
|
|
%dir %{_sharedstatedir}/containers/sigstore
|
|
|
|
|
%{_mandir}/man5/*
|
|
|
|
|
%dir %{_datadir}/containers
|
2021-01-28 14:55:19 +00:00
|
|
|
%{_datadir}/containers/containers.conf
|
2020-12-14 10:09:08 +00:00
|
|
|
%{_datadir}/containers/mounts.conf
|
|
|
|
|
%{_datadir}/containers/seccomp.json
|
|
|
|
|
%dir %{_datadir}/rhel/secrets
|
|
|
|
|
%{_datadir}/rhel/secrets/*
|
|
|
|
|
|
|
|
|
|
%changelog
|
2021-06-10 12:51:41 +00:00
|
|
|
<<<<<<< HEAD
|
2021-06-10 12:50:45 +00:00
|
|
|
* Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19
|
|
|
|
|
- Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
|
2021-06-10 12:51:41 +00:00
|
|
|
=======
|
2021-05-18 15:53:01 +00:00
|
|
|
* Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19
|
|
|
|
|
- use container-selinux 2.162.1 and use latest configs
|
2021-06-10 12:51:41 +00:00
|
|
|
>>>>>>> 0f389750defb05318144c76645808719db79b246
|
2021-06-10 12:50:45 +00:00
|
|
|
|
2021-05-11 16:18:59 +00:00
|
|
|
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
|
|
|
|
|
- Update containers.conf to latest, and change default log-driver to journald.
|
|
|
|
|
|
2021-04-15 20:08:36 +00:00
|
|
|
* Thu Apr 15 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-17
|
|
|
|
|
- add common dependencies like oci-runtime and container-selinux
|
|
|
|
|
- will pull in crun by default, runc users should install runc separately first
|
|
|
|
|
or explicitly require runc
|
|
|
|
|
|
2021-04-12 12:59:58 +00:00
|
|
|
* Mon Apr 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-16
|
|
|
|
|
- use latest configs from upstream
|
|
|
|
|
|
2021-04-09 11:27:41 +00:00
|
|
|
* Fri Apr 09 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-15
|
|
|
|
|
- pull latest files from upstream
|
|
|
|
|
|
2021-03-19 14:19:00 +00:00
|
|
|
* Fri Mar 19 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-14
|
|
|
|
|
- also provide skopeo-containers
|
|
|
|
|
- bump release tag for smooth upgrade from f34
|
|
|
|
|
- use latest upstream files
|
|
|
|
|
|
2021-02-18 15:19:40 +00:00
|
|
|
* Thu Feb 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-10
|
|
|
|
|
- install shortnames.conf as 000-shrotnames.conf
|
|
|
|
|
|
2021-02-15 19:12:49 +00:00
|
|
|
* Mon Feb 15 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-9
|
|
|
|
|
- Remove registry.centos.org and add quay.io from registries.conf
|
|
|
|
|
|
2021-02-15 19:09:01 +00:00
|
|
|
* Mon Feb 15 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-8
|
|
|
|
|
- Update content
|
|
|
|
|
|
2021-02-01 19:13:20 +00:00
|
|
|
* Mon Feb 01 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-7
|
|
|
|
|
- use the correct policy.json file
|
|
|
|
|
|
2021-01-28 19:39:00 +00:00
|
|
|
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-6
|
|
|
|
|
- short-name-mode="enforcing" in registries.conf
|
|
|
|
|
|
2021-01-28 16:04:13 +00:00
|
|
|
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-5
|
|
|
|
|
- number sources in order
|
|
|
|
|
|
2021-01-28 14:55:19 +00:00
|
|
|
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-4
|
|
|
|
|
- Resolves: #1916922 - do not depend on subscription-manager
|
|
|
|
|
- reorder sources in alphabetical order
|
|
|
|
|
|
2021-01-26 02:31:04 +00:00
|
|
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:1-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
|
2021-01-20 20:16:15 +00:00
|
|
|
* Wed Jan 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-2
|
|
|
|
|
- bump version to random number
|
|
|
|
|
- no connection of package to github.com/containers/common
|
|
|
|
|
- add conf files to dist-git repo
|
|
|
|
|
- bring back update.sh
|
|
|
|
|
|
2021-01-13 01:22:23 +00:00
|
|
|
* Wed Jan 13 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-3
|
|
|
|
|
- copy source files into builddir and change them there before installation
|
|
|
|
|
|
2021-01-12 18:59:17 +00:00
|
|
|
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-2
|
|
|
|
|
- move update.sh code to spec file itself
|
|
|
|
|
|
2021-01-12 16:15:47 +00:00
|
|
|
* Tue Jan 12 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:0.33.0-1
|
2021-01-12 15:24:12 +00:00
|
|
|
- update registries.conf and other files
|
2021-01-12 18:21:53 +00:00
|
|
|
- source urls in update.sh
|
2021-01-12 15:24:12 +00:00
|
|
|
|
2020-12-14 10:09:08 +00:00
|
|
|
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 3:1-1
|
|
|
|
|
- initial build
|
