diff --git a/Containerfile b/Containerfile index 89ec7231..d2103154 100644 --- a/Containerfile +++ b/Containerfile @@ -7,11 +7,9 @@ ADD https://codeberg.org/fabiscafe/game-devices-udev/archive/main.tar.gz /tmp/ub ADD files/etc/udev/rules.d /tmp/ublue-os/udev-rules/etc/udev/rules.d ADD files/usr/lib/systemd /tmp/ublue-os/update-services/usr/lib/systemd ADD files/etc/rpm-ostreed.conf /tmp/ublue-os/update-services/etc/rpm-ostreed.conf -ADD files/usr/etc /tmp/ublue-os/signing/usr/etc RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-udev-rules.tar.gz -C /tmp ublue-os/udev-rules RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-update-services.tar.gz -C /tmp ublue-os/update-services -RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-signing.tar.gz -C /tmp ublue-os/signing ADD rpmspec/*.spec /tmp/ublue-os diff --git a/files/usr/etc/containers/policy.json b/files/usr/etc/containers/policy.json deleted file mode 100644 index 5895ea61..00000000 --- a/files/usr/etc/containers/policy.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "default": [ - { - "type": "reject" - } - ], - "transports": { - "docker": { - "registry.access.redhat.com": [ - { - "type": "signedBy", - "keyType": "GPGKeys", - "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" - } - ], - "registry.redhat.io": [ - { - "type": "signedBy", - "keyType": "GPGKeys", - "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" - } - ], - "ghcr.io/ublue-os": [ - { - "type": "sigstoreSigned", - "keyPath": "/usr/etc/pki/containers/ublue-os.pub", - "signedIdentity": { - "type": "matchRepository" - } - } - ], - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "docker-daemon": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "atomic": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "dir": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "oci": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "tarball": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - } - } -} \ No newline at end of file diff --git a/files/usr/etc/containers/registries.d/ublue-os.yaml b/files/usr/etc/containers/registries.d/ublue-os.yaml deleted file mode 100644 index f314b0a2..00000000 --- a/files/usr/etc/containers/registries.d/ublue-os.yaml +++ /dev/null @@ -1,3 +0,0 @@ -docker: - ghcr.io/ublue-os: - use-sigstore-attachments: true \ No newline at end of file diff --git a/files/usr/etc/pki/ublue-os.pub b/files/usr/etc/pki/ublue-os.pub deleted file mode 100644 index 99fc8f94..00000000 --- a/files/usr/etc/pki/ublue-os.pub +++ /dev/null @@ -1,4 +0,0 @@ ------BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA -cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w== ------END PUBLIC KEY----- \ No newline at end of file diff --git a/rpmspec/ublue-os-signing.spec b/rpmspec/ublue-os-signing.spec deleted file mode 100644 index cbcce9cb..00000000 --- a/rpmspec/ublue-os-signing.spec +++ /dev/null @@ -1,41 +0,0 @@ -Name: ublue-os-signing -Packager: ublue-os -Vendor: ublue-os -Version: 0.1 -Release: 1%{?dist} -Summary: Signing files and keys for Universal Blue -License: MIT -URL: https://github.com/ublue-os/config - -BuildArch: noarch - -Source0: ublue-os-signing.tar.gz - -%global sub_name %{lua:t=string.gsub(rpm.expand("%{NAME}"), "^ublue%-os%-", ""); print(t)} - -%description -Adds files and keys for signing Universal Blue images - -%prep -%setup -q -c -T - -%build -mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR} -mkdir -p -m0755 %{buildroot}%{_exec_prefix}/etc/containers/registries.d -mkdir -p -m0755 %{buildroot}%{_exec_prefix}/etc/pki - -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}/%{_exec_prefix}/etc/containers/policy.json -%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/etc/containers/registries.d/ublue-os.yaml -%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/etc/pki/ublue-os.pub -%attr(0644,root,root) %{_exec_prefix}/etc/containers/policy.json -%attr(0644,root,root) %{_exec_prefix}/etc/containers/registries.d/ublue-os.yaml -%attr(0644,root,root) %{_exec_prefix}/etc/pki/ublue-os.pub - -%changelog -* Mon Jul 17 2023 RJ Trujillo - 0.1 -- Add package for signing files and keys