diff --git a/.gitea/workflows/build-hydros-containers.yml b/.gitea/workflows/build-hydros-containers.yml index 1558430..e2e9981 100644 --- a/.gitea/workflows/build-hydros-containers.yml +++ b/.gitea/workflows/build-hydros-containers.yml @@ -30,4 +30,4 @@ jobs: spec-file-path: ./hydros-containers/hydros-containers.spec repository-user: eriq12 repository-user-token: ${{ secrets.RPM_PACKAGE_TOKEN }} - extra-source-directory: ./hydros-containers/containers + extra-source-directory: ./hydros-containers/registries.d diff --git a/hydros-containers/containers/policy.json b/hydros-containers/containers/policy.json deleted file mode 100644 index 59ee1bb..0000000 --- a/hydros-containers/containers/policy.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "default": [ - { - "type": "reject" - } - ], - "transports": { - "docker": { - "git.hydrosaber.com/hydros/hydros": [ - { - "type": "sigstoreSigned", - "keyPath": "/etc/pki/containers/hydros.pub", - "signedIdentity": { - "type": "matchRepository" - } - } - ], - "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" - } - ], - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "docker-daemon": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "atomic": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "containers-storage": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "dir": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "oci": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "oci-archive": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "docker-archive": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - }, - "tarball": { - "": [ - { - "type": "insecureAcceptAnything" - } - ] - } - } -} diff --git a/hydros-containers/hydros-containers.spec b/hydros-containers/hydros-containers.spec index afbaf9d..b50ad21 100644 --- a/hydros-containers/hydros-containers.spec +++ b/hydros-containers/hydros-containers.spec @@ -1,5 +1,5 @@ Name: hydros-containers -Version: 0.0.1 +Version: 0.0.2 Release: %autorelease Summary: The bundle of configuration overrides for containers for HydrOS BuildArch: noarch @@ -13,13 +13,13 @@ Source0: source.tar.gz %autosetup -C %install -install -Dm0444 -t %{buildroot}%{_sysconfdir}/containers/ %{_builddir}/%{name}-%{version}/policy.json -install -Dm0444 -t %{buildroot}%{_sysconfdir}/containers/registries.d/ %{_builddir}/%{name}-%{version}/registries.d/git.hydrosaber.com-hydros.yaml +install -Dm0444 -t %{buildroot}%{_sysconfdir}/containers/registries.d/ %{_builddir}/%{name}-%{version}/git.hydrosaber.com-hydros.yaml %files -%{_sysconfdir}/containers/policy.json -%{_sysconfdir}/containers/registries.d/git.hydrosaber.com-hydros.yaml +%{_sysconfdir}/containers/git.hydrosaber.com-hydros.yaml %changelog * Mon Mar 30 2026 Eriq Taing +- removed policy.json due to conflicts +* Mon Mar 30 2026 Eriq Taing - First version packaged diff --git a/hydros-containers/containers/registries.d/git.hydrosaber.com-hydros.yaml b/hydros-containers/registries.d/git.hydrosaber.com-hydros.yaml similarity index 100% rename from hydros-containers/containers/registries.d/git.hydrosaber.com-hydros.yaml rename to hydros-containers/registries.d/git.hydrosaber.com-hydros.yaml