Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-disk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
id: build-iso
uses: osbuild/bootc-image-builder-action@main
with:
config-file: ${{ matrix.flavor == '-nvidia' && './iso-nvidia.toml' || './iso.toml' }}
config-file: ./iso${{ matrix.flavor }}.toml
image: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}${{ matrix.flavor }}:latest
types: anaconda-iso
rootfs: btrfs
Expand Down
27 changes: 11 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,12 @@ jobs:
MAX_RETRIES: 3
run: |
set -x
# HACK: push a second time so layer annotations are present
# HACK: push two times so layer annotations are present
# TODO: remove me when https://github.com/containers/podman/issues/27796 fixed
for i in $(seq "${MAX_RETRIES}"); do
sudo /home/linuxbrew/.linuxbrew/bin/podman push --digestfile=/tmp/digestfile "localhost/${IMAGE_NAME}:${DEFAULT_TAG}" "${IMAGE_REGISTRY}/${IMAGE_NAME}:${DEFAULT_TAG}-${PLATFORM}" && break || sleep $((5 * i));
done
echo "remote_image_digest=$(< /tmp/digestfile)" | tee "${GITHUB_OUTPUT}"

for i in $(seq "${MAX_RETRIES}"); do
sudo /home/linuxbrew/.linuxbrew/bin/podman push --digestfile=/tmp/digestfile "localhost/${IMAGE_NAME}:${DEFAULT_TAG}" "${IMAGE_REGISTRY}/${IMAGE_NAME}:${DEFAULT_TAG}-${PLATFORM}" && break || sleep $((5 * i));
for _ in $(seq 2); do
for i in $(seq "${MAX_RETRIES}"); do
sudo /home/linuxbrew/.linuxbrew/bin/podman push --digestfile=/tmp/digestfile "localhost/${IMAGE_NAME}:${DEFAULT_TAG}" "${IMAGE_REGISTRY}/${IMAGE_NAME}:${DEFAULT_TAG}-${PLATFORM}" && break || sleep $((5 * i));
done
done
echo "remote_image_digest=$(< /tmp/digestfile)" | tee "${GITHUB_OUTPUT}"

Expand Down Expand Up @@ -270,15 +267,13 @@ jobs:
podman manifest annotate --index --annotation "${LABEL}" "${TARGET_MANIFEST}"
done <<< "${LABELS}"

while IFS= read -r TAG; do
podman manifest push --all=false --digestfile=/tmp/digestfile "${TARGET_MANIFEST}" "${TARGET_MANIFEST}:${TAG}"
done <<< "${TAGS}"

# HACK: push a second time so layer annotations are present
# HACK: push two times so layer annotations are present
# TODO: remove me when https://github.com/containers/podman/issues/27796 fixed
while IFS= read -r TAG; do
podman manifest push --all=false --digestfile=/tmp/digestfile "${TARGET_MANIFEST}" "${TARGET_MANIFEST}:${TAG}"
done <<< "${TAGS}"
for _ in $(seq 2); do
while IFS= read -r TAG; do
podman manifest push --all=false --digestfile=/tmp/digestfile "${TARGET_MANIFEST}" "${TARGET_MANIFEST}:${TAG}"
done <<< "${TAGS}"
done

cosign sign -y --new-bundle-format=false --use-signing-config=false --key env://COSIGN_PRIVATE_KEY "${TARGET_MANIFEST}@$(< /tmp/digestfile)"
done
Loading