From 7118c8b6e790898616c4868adc639e5b37776440 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 17 Mar 2020 16:47:00 -0400 Subject: [PATCH] skopeo.spec: drop [/var]/srv/containers from file list Stop creating `/srv/containers` directories. Files under `/srv` are usually owned and created by the users themselves, so owning directories under there seems odd. In fact, grepping through all the Fedora spec files, no other package creates or owns anything in `/srv` apart from this package. The SELinux file context installed by [1] will still take care of proper labeling for the directory. This is analogous to how e.g. `/srv/www` is correctly labeled by the policy, and HTTP servers like `httpd` and `nginx` don't explicitly create or own `/srv/www`. This also works around rpm-ostree currently choking on `/srv/containers` because it falls outside the list of permitted paths. [1] https://github.com/containers/container-selinux/pull/72 --- skopeo.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/skopeo.spec b/skopeo.spec index 88ddef9..a3f13f4 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -46,7 +46,7 @@ Epoch: 1 Epoch: 2 %endif Version: 0.1.42 -Release: 0.3.dev.git%{shortcommit0}%{?dist} +Release: 0.4.dev.git%{shortcommit0}%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -342,10 +342,6 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret install -d -p %{buildroot}/%{_datadir}/%{name}/test/system cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ -# shareable directory for containers -mkdir -p %{buildroot}/var/srv/containers -mkdir -p %{buildroot}/srv/containers - # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -403,8 +399,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %files -n containers-common -%dir /var/srv/containers -%dir /srv/containers %dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers/certs.d %dir %{_sysconfdir}/containers/registries.d @@ -440,6 +434,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Tue Mar 17 2020 Jonathan Lebon - 1:0.1.42-0.2.dev.git7a0a8c2 +- Drop /srv/containers and /var/srv/container from file list + * Thu Mar 19 2020 RH Container Bot - 1:0.1.42-0.3.dev.git7170702 - autobuilt 7170702