rpm: update config files for drop ins #795
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [containers] | ||
| log_driver = "journald" | ||
|
|
||
| [engine] | ||
| runtime = "crun" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Default search registries for fedora | ||
| unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io"] | ||
|
|
||
| # Enforcing mode for short names is default for Fedora 34 and newer | ||
| short-name-mode="enforcing" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Default search registries for RHEL | ||
| unqualified-search-registries = ["registry.access.redhat.com", "registry.redhat.io", "docker.io"] | ||
|
|
||
| # Enforcing mode for short names is default for Fedora 34 and newer | ||
| short-name-mode="enforcing" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [storage.options] | ||
| additionalimagestores = ["/usr/lib/containers/storage"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| [storage] | ||
| driver = "overlay" | ||
|
|
||
| [storage.options.overlay] | ||
| # mountopt specifies comma separated list of extra mount options | ||
| mountopt = "nodev,metacopy=on" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,11 @@ Requires: (fuse-overlayfs if fedora-release-identity-server) | |
| %else | ||
| Suggests: fuse-overlayfs | ||
| %endif | ||
| # Conflict versions using the old config file loading to avoid mismatch between code and configs. | ||
| Conflicts: podman < 5:6 | ||
| Conflicts: buildah < 2:1.44 | ||
| Conflicts: skopeo < 1:1.23 | ||
|
Comment on lines
+46
to
+48
Member
There was a problem hiding this comment. This works. PTAL as well @inknos @jankaluza @jnovy . |
||
|
|
||
| URL: https://github.com/%{project}/%{repo} | ||
| Source0: %{url}/archive/refs/tags/common/v%{version}.tar.gz | ||
| Source1: https://raw.githubusercontent.com/containers/shortnames/refs/heads/main/shortnames.conf | ||
|
|
@@ -65,11 +70,10 @@ Requires: container-network-stack | |
| Requires: oci-runtime | ||
| Requires: passt | ||
| %if %{defined fedora} | ||
| Recommends: composefs | ||
| Recommends: crun | ||
| Requires: (crun if fedora-release-identity-server) | ||
| Requires: netavark >= %{netavark_epoch}:2 | ||
| Suggests: slirp4netns | ||
| Recommends: qemu-user-static | ||
| Requires: (qemu-user-static-aarch64 if fedora-release-identity-server) | ||
|
|
@@ -84,10 +88,6 @@ not required by Skopeo. | |
| %prep | ||
| %autosetup -Sgit -n %{repo}-common-v%{version} | ||
|
|
||
| %build | ||
| mkdir -p man5 | ||
| for i in common/docs/*.5.md image/docs/*.5.md storage/docs/*.5.md; do | ||
|
|
@@ -96,7 +96,7 @@ done | |
|
|
||
| %install | ||
| # install config and policy files for registries | ||
| install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,networks,systemd,registries.conf.d,registries.d} | ||
| install -dp %{buildroot}%{_sharedstatedir}/containers/sigstore | ||
| install -dp %{buildroot}%{_datadir}/containers/systemd | ||
| install -dp %{buildroot}%{_prefix}/lib/containers/storage | ||
|
|
@@ -105,20 +105,32 @@ touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-images/images.lock | |
| install -dp -m 700 %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers | ||
| touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers/layers.lock | ||
|
|
||
| install -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/containers/registries.conf.d/000-shortnames.conf | ||
| install -Dp -m0644 image/default.yaml %{buildroot}%{_datadir}/containers/registries.d/default.yaml | ||
| install -Dp -m0644 image/default-policy.json %{buildroot}%{_datadir}/containers/policy.json | ||
| install -Dp -m0644 image/registries.conf %{buildroot}%{_datadir}/containers/registries.conf | ||
| install -Dp -m0644 storage/storage.conf %{buildroot}%{_datadir}/containers/storage.conf | ||
|
|
||
| # install custom vendor overwrites | ||
| install -Dp -m0644 common/rpm/00-containers.conf %{buildroot}%{_datadir}/containers/containers.conf.d/00-vendor.conf | ||
| install -Dp -m0644 common/rpm/00-storage.conf %{buildroot}%{_datadir}/containers/storage.conf.d/00-vendor.conf | ||
| install -Dp -m0644 common/rpm/00-storage-additional-store.conf %{buildroot}%{_datadir}/containers/storage.rootful.conf.d/00-vendor-additional-store.conf | ||
|
mtrmac marked this conversation as resolved.
|
||
|
|
||
| %if %{defined fedora} | ||
| install -Dp -m0644 common/rpm/00-fedora-registries.conf %{buildroot}%{_datadir}/containers/registries.conf.d/00-vendor.conf | ||
| %else | ||
| install -Dp -m0644 common/rpm/00-rhel-registries.conf %{buildroot}%{_datadir}/containers/registries.conf.d/00-vendor.conf | ||
| %endif | ||
|
|
||
|
|
||
| # RPM-GPG-KEY-redhat-release already exists on rhel envs, install only on | ||
| # fedora and centos | ||
| %if %{defined fedora} || %{defined centos} | ||
| install -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release | ||
| %endif | ||
|
|
||
| install -Dp -m0644 common/contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot}%{_datadir}/containers/registries.d | ||
| install -Dp -m0644 common/contrib/redhat/registry.redhat.io.yaml -t %{buildroot}%{_datadir}/containers/registries.d | ||
|
|
||
| # install manpages | ||
| for i in man5/*.5; do | ||
|
|
@@ -141,6 +153,22 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/ | |
| # Placeholder check to silence rpmlint warnings | ||
| %check | ||
|
|
||
| %posttrans | ||
| # Restore user-modified config files from .rpmsave | ||
| for file in \ | ||
| policy.json \ | ||
| registries.conf \ | ||
| registries.conf.d/000-shortnames.conf \ | ||
| registries.d/default.yaml \ | ||
| registries.d/registry.redhat.io.yaml \ | ||
| registries.d/registry.access.redhat.com.yaml | ||
| do | ||
| file="%{_sysconfdir}/containers/${file}" | ||
| if [ -f "${file}.rpmsave" ]; then | ||
| mv "${file}.rpmsave" "${file}" | ||
| fi | ||
| done | ||
|
|
||
| %files | ||
| %dir %{_sysconfdir}/containers | ||
| %dir %{_sysconfdir}/containers/certs.d | ||
|
|
@@ -157,15 +185,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/ | |
| %{_prefix}/lib/containers/storage/overlay-images/images.lock | ||
| %{_prefix}/lib/containers/storage/overlay-layers/layers.lock | ||
|
|
||
|
|
||
| %if 0%{?fedora} || 0%{?centos} | ||
| %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release | ||
| %endif | ||
| %ghost %{_sysconfdir}/containers/storage.conf | ||
| %ghost %{_sysconfdir}/containers/containers.conf | ||
| %dir %{_sharedstatedir}/containers/sigstore | ||
|
|
@@ -179,6 +202,21 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/ | |
| %{_datadir}/containers/containers.conf | ||
| %{_datadir}/containers/mounts.conf | ||
|
Member
There was a problem hiding this comment. off-topic: would it be helpful to add drop-in support for mounts? base mounts.conf currently has
Member
Author
There was a problem hiding this comment. that was not in scope for our config file rewrite. I have not seen user complains about it so I never considered it. |
||
| %{_datadir}/containers/seccomp.json | ||
| %{_datadir}/containers/policy.json | ||
| %{_datadir}/containers/registries.conf | ||
| %dir %{_datadir}/containers/registries.conf.d | ||
| %{_datadir}/containers/registries.conf.d/000-shortnames.conf | ||
| %{_datadir}/containers/registries.conf.d/00-vendor.conf | ||
| %dir %{_datadir}/containers/registries.d | ||
| %{_datadir}/containers/registries.d/default.yaml | ||
| %{_datadir}/containers/registries.d/registry.redhat.io.yaml | ||
| %{_datadir}/containers/registries.d/registry.access.redhat.com.yaml | ||
| %dir %{_datadir}/containers/containers.conf.d | ||
| %{_datadir}/containers/containers.conf.d/00-vendor.conf | ||
| %dir %{_datadir}/containers/storage.conf.d | ||
| %{_datadir}/containers/storage.conf.d/00-vendor.conf | ||
| %dir %{_datadir}/containers/storage.rootful.conf.d | ||
| %{_datadir}/containers/storage.rootful.conf.d/00-vendor-additional-store.conf | ||
|
mtrmac marked this conversation as resolved.
|
||
| %dir %{_datadir}/rhel | ||
| %dir %{_datadir}/rhel/secrets | ||
| %{_datadir}/rhel/secrets/* | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this still relevant as this is RHEL registries?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I should just drop the comment I guess