containers-common-4:1-4
- Resolves: #1916922 - do not depend on subscription-manager - reorder sources in alphabetical order Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
4d27c8b08e
commit
262d9349be
@ -15,33 +15,32 @@
|
||||
Epoch: 4
|
||||
Name: containers-common
|
||||
Version: 1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Common configuration and documentation for containers
|
||||
License: ASL 2.0
|
||||
BuildArch: noarch
|
||||
BuildRequires: go-md2man
|
||||
Recommends: fuse-overlayfs
|
||||
Recommends: slirp4netns
|
||||
Recommends: subscription-manager
|
||||
Source1: %{github_containers}/storage/%{storage_branch}/storage.conf
|
||||
Source2: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
|
||||
Source3: %{github_containers}/common/%{common_branch}/pkg/subscriptions/mounts.conf
|
||||
Source4: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
|
||||
Source5: %{github_containers}/image/%{image_branch}/registries.conf
|
||||
Source6: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
|
||||
Source7: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
|
||||
Source8: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
|
||||
Source9: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
|
||||
Source10: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
|
||||
Source11: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
|
||||
Source12: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
|
||||
Source13: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
|
||||
Source14: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
|
||||
Source15: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
|
||||
Source16: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
|
||||
Source17: %{github_containers}/skopeo/%{skopeo_branch}/integration/fixtures/policy.json
|
||||
Source18: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
|
||||
Source19: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
|
||||
Source4: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
|
||||
Source3: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
|
||||
Source2: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
|
||||
Source1: %{github_containers}/common/%{common_branch}/pkg/subscriptions/mounts.conf
|
||||
Source12: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
|
||||
Source10: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
|
||||
Source7: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
|
||||
Source5: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
|
||||
Source13: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
|
||||
Source11: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
|
||||
Source8: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
|
||||
Source9: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
|
||||
Source6: %{github_containers}/image/%{image_branch}/registries.conf
|
||||
Source14: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
|
||||
Source15: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
|
||||
Source17: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
|
||||
Source16: %{github_containers}/skopeo/%{skopeo_branch}/integration/fixtures/policy.json
|
||||
Source19: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
|
||||
Source18: %{github_containers}/storage/%{storage_branch}/storage.conf
|
||||
|
||||
%description
|
||||
This package contains common configuration files and documentation for container
|
||||
@ -95,25 +94,30 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
|
||||
%files
|
||||
%dir %{_sysconfdir}/containers
|
||||
%dir %{_sysconfdir}/containers/certs.d
|
||||
%dir %{_sysconfdir}/containers/registries.d
|
||||
%dir %{_sysconfdir}/containers/oci
|
||||
%dir %{_sysconfdir}/containers/oci/hooks.d
|
||||
%dir %{_sysconfdir}/containers/registries.conf.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.conf.d/shortnames.conf
|
||||
%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
|
||||
%config(noreplace) %{_sysconfdir}/containers/storage.conf
|
||||
%ghost %{_sysconfdir}/containers/containers.conf
|
||||
%dir %{_sharedstatedir}/containers/sigstore
|
||||
%{_mandir}/man5/*
|
||||
%dir %{_datadir}/containers
|
||||
%{_datadir}/containers/containers.conf
|
||||
%{_datadir}/containers/mounts.conf
|
||||
%{_datadir}/containers/seccomp.json
|
||||
%{_datadir}/containers/containers.conf
|
||||
%dir %{_datadir}/rhel/secrets
|
||||
%{_datadir}/rhel/secrets/*
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4:1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
@ -321,6 +321,10 @@ default_sysctls = [
|
||||
#
|
||||
# infra_image = "k8s.gcr.io/pause:3.2"
|
||||
|
||||
# Maximum number of image layers to be copied (pulled/pushed) simultaneously.
|
||||
# Not setting this field, or setting it to zero, will fall back to containers/image defaults.
|
||||
# image_parallel_copies=0
|
||||
|
||||
# Specify the locking mechanism to use; valid values are "shm" and "file".
|
||||
# Change the default only if you are sure of what you are doing, in general
|
||||
# "file" is useful only on platforms where cgo is not available for using the
|
||||
|
@ -361,6 +361,11 @@ pod, we start a `pause` process in a container to hold open the namespaces
|
||||
associated with the pod. This container does nothing other then sleep,
|
||||
reserving the pods resources for the lifetime of the pod.
|
||||
|
||||
**image_parallel_copies**=0
|
||||
|
||||
Maximum number of image layers to be copied (pulled/pushed) simultaneously.
|
||||
Not setting this field will fall back to containers/image defaults. (6)
|
||||
|
||||
**lock_type**="shm"
|
||||
|
||||
Specify the locking mechanism to use; valid values are "shm" and "file".
|
||||
|
Loading…
Reference in New Issue
Block a user