Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Move policy.json back to /usr/etc temporarily while issues are worked out #311

Merged
merged 1 commit into from
Aug 8, 2024
Merged

fix: Move policy.json back to /usr/etc temporarily while issues are worked out #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ADD files/etc/systemd /tmp/ublue-os/update-services/etc/systemd
ADD files/usr/lib/systemd /tmp/ublue-os/update-services/usr/lib/systemd

ADD files/etc/containers /tmp/ublue-os/signing/etc/containers
ADD files/usr/etc/containers /tmp/ublue-os/signing/usr/etc/containers
ADD files/etc/pki /tmp/ublue-os/signing/etc/pki

RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-udev-rules.tar.gz -C /tmp ublue-os/udev-rules
Expand Down
0 files/etc/containers/policy.json → files/usr/etc/containers/policy.json
View file
Open in desktop
File renamed without changes.
10 changes: 7 additions & 3 deletions rpmspec/ublue-os-signing.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: ublue-os-signing
Packager: ublue-os
Vendor: ublue-os
Version: 0.3
Version: 0.4
Release: 1%{?dist}
Summary: Signing files and keys for Universal Blue
License: MIT
Expand All @@ -23,24 +23,28 @@ Adds files and keys for signing Universal Blue images
mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR}
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/containers/registries.d
mkdir -p -m0755 %{buildroot}%{_sysconfdir}/pki
mkdir -p -m0755 %{buildroot}%{_exec_prefix}/etc/containers

tar xf %{SOURCE0} -C %{buildroot}%{_datadir}/%{VENDOR} --strip-components=1
tar xf %{SOURCE0} -C %{buildroot} --strip-components=2

%files
%dir %attr(0755,root,root) %{_datadir}/%{VENDOR}/%{sub_name}
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/policy.json
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/etc/containers/policy.json
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/ublue-os.yaml
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/ublue-os.pub
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub
%attr(0644,root,root) %{_sysconfdir}/containers/policy.json
%attr(0644,root,root) %{_exec_prefix}/etc/containers/policy.json
%attr(0644,root,root) %{_sysconfdir}/containers/registries.d/ublue-os.yaml
%attr(0644,root,root) %{_sysconfdir}/pki/containers/ublue-os.pub
%attr(0644,root,root) %{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
%attr(0644,root,root) %{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub

%changelog
* Thu Aug 08 2024 Kyle Gospodnetich <[email protected]> - 0.4
- Moved policy.json back to /usr/etc/ temporarily

* Wed Aug 07 2024 Kyle Gospodnetich <[email protected]> - 0.3
- Moved files from /usr/etc/ to /etc/

Expand Down
Loading