diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d0d3c30..3466590c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,8 @@ on: type: boolean default: false env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + PULL_IMAGE_REGISTRY: ghcr.io/ublue-os + PUSH_IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} @@ -119,21 +120,21 @@ jobs: with: containers: ${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} pubkey: https://raw.githubusercontent.com/ublue-os/${{ matrix.base_image_flavor }}/main/cosign.pub - registry: ${{ env.IMAGE_REGISTRY }} + registry: ${{ env.PULL_IMAGE_REGISTRY }} - name: Verify akmods image uses: EyeCantCU/cosign-action/verify@v0.3.0 with: containers: akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} pubkey: https://raw.githubusercontent.com/ublue-os/akmods/main/cosign.pub - registry: ${{ env.IMAGE_REGISTRY }} + registry: ${{ env.PULL_IMAGE_REGISTRY }} - name: Verify akmods-nvidia image uses: EyeCantCU/cosign-action/verify@v0.3.0 with: containers: akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} pubkey: https://raw.githubusercontent.com/ublue-os/akmods/main/cosign.pub - registry: ${{ env.IMAGE_REGISTRY }} + registry: ${{ env.PULL_IMAGE_REGISTRY }} # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action @@ -167,9 +168,9 @@ jobs: command: | # pull the base images used for FROM in Containerfile so # we can retry on that unfortunately common failure case - sudo podman pull ${{ env.IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} - sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} - sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} + sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} + sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} + sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} # Add rechunk as well to remove this source of failure sudo podman pull ghcr.io/hhd-dev/rechunk:v1.0.1 @@ -182,7 +183,7 @@ jobs: attempt_delay: 15000 command: | set -eo pipefail - skopeo inspect docker://${{ env.IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} > source.json + skopeo inspect docker://${{ env.PULL_IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} > source.json ver=$(jq -r '.Labels["org.opencontainers.image.version"]' source.json) if [ -z "$ver" ] || [ "null" = "$ver" ]; then echo "inspected image version must not be empty or null" @@ -248,9 +249,9 @@ jobs: - name: Remove auxiliary images # We are tight on space, need at least 2x for OSTree run: | - sudo podman image rm ${{ env.IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} - sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} - sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} + sudo podman image rm ${{ env.PULL_IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} + sudo podman image rm ${{ env.PULL_IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} + sudo podman image rm ${{ env.PULL_IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }} # Generate the previous image reference used by the Rechunker - name: Generate previous reference @@ -260,7 +261,7 @@ jobs: if [ "${{ github.event.inputs.fresh-rechunk }}" == "true" ]; then IMAGEREF="" else - IMAGEREF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:stable" + IMAGEREF="${{ env.PUSH_IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:stable" fi echo "ref=${IMAGEREF}" >> $GITHUB_OUTPUT @@ -377,7 +378,7 @@ jobs: id: registry_case uses: ASzc/change-string-case-action@v6 with: - string: ${{ env.IMAGE_REGISTRY }} + string: ${{ env.PUSH_IMAGE_REGISTRY }} # Push the image to GHCR (Image Registry) - name: Push To GHCR @@ -409,6 +410,7 @@ jobs: registry-token: ${{ secrets.GITHUB_TOKEN }} signing-secret: ${{ secrets.SIGNING_SECRET }} tags: ${{ steps.digest.outputs.digest }} + registry: ${{ env.PUSH_IMAGE_REGISTRY }} generate_release: name: Generate Release