From bb6b8f7c1c9ac4ccfc421f1221a0036569bdf486 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Thu, 23 Apr 2026 05:57:42 -0700 Subject: [PATCH] Repo changes and update package Dont attach rpms/debs to release anymore, just use the repos. Attempt to make a multiarch deb repo. Bump tpm package version. Signed-off-by: Kevin Fox --- .github/workflows/release.yaml | 8 ++++---- examples/rpms/Dockerfile.repos | 12 ++++++++++-- examples/rpms/apt-release.conf | 9 +++++++++ examples/rpms/spiffe-pve-ek.spec | 2 +- .../rpms/spire-agent-nodeattestor-tpmdirect.spec | 2 +- .../rpms/spire-server-nodeattestor-tpmdirect.spec | 2 +- 6 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 examples/rpms/apt-release.conf diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fb2e5b4..911ea58 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -85,10 +85,10 @@ jobs: gh release upload "${GITHUB_REF#refs/tags/}" examples/rpms/rpm.pub /tmp/releasepackages/*/*/*.rpm /tmp/releasepackages/*/*/*.deb - name: Setup Pages uses: actions/configure-pages@v5 - - name: Upload Artifact - uses: actions/upload-pages-artifact@v3 - with: - path: /tmp/packages + #- name: Upload Artifact + # uses: actions/upload-pages-artifact@v3 + # with: + # path: /tmp/packages - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 diff --git a/examples/rpms/Dockerfile.repos b/examples/rpms/Dockerfile.repos index a8d2169..bcb752a 100644 --- a/examples/rpms/Dockerfile.repos +++ b/examples/rpms/Dockerfile.repos @@ -38,14 +38,22 @@ RUN \ FROM docker.io/library/debian:stable-slim AS deb-builder WORKDIR /tmp COPY DEBS /tmp/packages/DEBS +COPY apt-release.conf /tmp/apt-release.conf RUN \ apt-get update && \ - apt-get install -y --no-install-recommends dpkg-dev gzip && \ + apt-get install -y --no-install-recommends dpkg-dev apt-utils gzip && \ rm -rf /var/lib/apt/lists/* && \ + mkdir -p /tmp/packages/DEBS/binary-amd64/ && \ cd /tmp/packages/DEBS/amd64 && \ dpkg-scanpackages --arch amd64 . | gzip -9c > Packages.gz && \ + cd .. && \ + dpkg-scanpackages --arch amd64 amd64/ | gzip -9c > binary-amd64/Packages.gz && \ + mkdir -p /tmp/packages/DEBS/binary-arm64/ && \ cd /tmp/packages/DEBS/arm64 && \ - dpkg-scanpackages --arch arm64 . | gzip -9c > Packages.gz + dpkg-scanpackages --arch arm64 . | gzip -9c > Packages.gz && \ + cd .. && \ + dpkg-scanpackages --arch arm64 arm64/ | gzip -9c > binary-arm64/Packages.gz && \ + apt-ftparchive -c /tmp/apt-release.conf release . > Release FROM docker.io/library/nginx:latest RUN rm -rf /usr/share/nginx/html/* diff --git a/examples/rpms/apt-release.conf b/examples/rpms/apt-release.conf new file mode 100644 index 0000000..15217dd --- /dev/null +++ b/examples/rpms/apt-release.conf @@ -0,0 +1,9 @@ +APT::FTPArchive::Release { + Origin "spire-examples"; + Label "spire-examples"; + Suite "stable"; + Codename "stable"; + Architectures "amd64 arm64"; + Components "main"; + Description "Automated Multi-Arch Repo for spire-examples"; +}; diff --git a/examples/rpms/spiffe-pve-ek.spec b/examples/rpms/spiffe-pve-ek.spec index b3745d3..076c2fd 100644 --- a/examples/rpms/spiffe-pve-ek.spec +++ b/examples/rpms/spiffe-pve-ek.spec @@ -21,7 +21,7 @@ Summary: SPIFFE PVE EK Service Name: spiffe-pve-ek -Version: 1.11.1 +Version: 1.11.3 Release: 1 Group: Applications/Internet License: Apache-2.0 diff --git a/examples/rpms/spire-agent-nodeattestor-tpmdirect.spec b/examples/rpms/spire-agent-nodeattestor-tpmdirect.spec index 22767c8..777582d 100644 --- a/examples/rpms/spire-agent-nodeattestor-tpmdirect.spec +++ b/examples/rpms/spire-agent-nodeattestor-tpmdirect.spec @@ -21,7 +21,7 @@ Summary: SPIRE Agent Node Attestor TPM Direct Name: spire-agent-nodeattestor-tpmdirect -Version: 1.11.1 +Version: 1.11.3 Release: 1 Group: Applications/Internet License: Apache-2.0 diff --git a/examples/rpms/spire-server-nodeattestor-tpmdirect.spec b/examples/rpms/spire-server-nodeattestor-tpmdirect.spec index eaad477..f835fdb 100644 --- a/examples/rpms/spire-server-nodeattestor-tpmdirect.spec +++ b/examples/rpms/spire-server-nodeattestor-tpmdirect.spec @@ -21,7 +21,7 @@ Summary: SPIRE Server Node Attestor TPM Direct Name: spire-server-nodeattestor-tpmdirect -Version: 1.11.1 +Version: 1.11.3 Release: 1 Group: Applications/Internet License: Apache-2.0