Skip to content

fix(ci): push the exported GCE disk to GHCR by relative path #2524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brad-Edwards merged 1 commit into from
Oct 6, 2026
Merged

fix(ci): push the exported GCE disk to GHCR by relative path #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions .github/workflows/packer-gcp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,23 +443,27 @@ jobs:
esac
PACKAGE="ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/shifter-gce-${IMAGE_TYPE}"
TAG="gce-${GCE_IMAGE_ID}"
DISK_PATH="$(mktemp "${RUNNER_TEMP}/${IMAGE_TYPE}.XXXXXX.tar.gz")"
trap 'rm -f "${DISK_PATH}"' EXIT
DISK_DIR="$(mktemp -d "${RUNNER_TEMP}/gce-disk.XXXXXX")"
DISK_FILE="${IMAGE_TYPE}.tar.gz"
trap 'rm -f "${DISK_DIR}/${DISK_FILE}"; rmdir "${DISK_DIR}"' EXIT
# ORAS hashes a file before upload. Keep the disk out of the checkout
# and clean it even when the registry upload fails.
gcloud storage cp --quiet "${GCE_BASE_DISK_URI}" "${DISK_PATH}"
gcloud storage cp --quiet "${GCE_BASE_DISK_URI}" "${DISK_DIR}/${DISK_FILE}"
printf '%s' "${GH_TOKEN}" | oras login ghcr.io --username "${GITHUB_ACTOR}" --password-stdin
# Provenance annotations bind the artifact to its protected build so the
# tenant bootstrap can validate it before importing (issue #2309). The
# digest-pinned reference (never the mutable tag) is the deploy input.
# ORAS rejects absolute file paths, so push the file by its relative
# name from its own directory.
cd "${DISK_DIR}"
DIGEST="$(oras push --format json \
--artifact-type application/vnd.shifter.gce-image.v1 \
--annotation "org.opencontainers.image.revision=${GITHUB_SHA}" \
--annotation "com.shifter.image.role=${IMAGE_TYPE}" \
--annotation "com.shifter.image.gce-image-id=${GCE_IMAGE_ID}" \
--annotation "com.shifter.build.run-id=${GITHUB_RUN_ID}" \
--annotation "com.shifter.build.repository=${GITHUB_REPOSITORY}" \
"${PACKAGE}:${TAG}" "${DISK_PATH}:application/vnd.shifter.gce-image.tar.gz" | jq -er '.digest')"
"${PACKAGE}:${TAG}" "${DISK_FILE}:application/vnd.shifter.gce-image.tar.gz" | jq -er '.digest')"
case "${DIGEST}" in sha256:[0-9a-f][0-9a-f]*) ;; *)
echo "::error::ORAS did not return an OCI manifest digest."
exit 1
Expand Down
3 changes: 3 additions & 0 deletions scripts/adr_guard/tests/test_deploy_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,9 @@ def test_gcp_base_image_publish_uses_gce_native_contract_and_protected_ref_gate(
self.assertIn("oras-project/setup-oras@", build)
self.assertIn("application/vnd.shifter.gce-image.tar.gz", build)
self.assertIn("application/vnd.shifter.gce-image.v1", build)
# ORAS rejects absolute file paths: the disk is pushed by relative name.
self.assertIn('cd "${DISK_DIR}"', build)
self.assertIn('"${DISK_FILE}:application/vnd.shifter.gce-image.tar.gz"', build)
self.assertIn("ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/shifter-gce-${IMAGE_TYPE}", build)
self.assertIn("oci://${PACKAGE}@${DIGEST}", build)
# Provenance annotations bind the artifact to its protected build.
Expand Down
Loading