From 98a633bae83d48ab0accbece3d497772ef802d4e Mon Sep 17 00:00:00 2001
From: Matthias Wolf <matthias.wolf@epfl.ch>
Date: Wed, 4 Dec 2024 17:00:24 +0100
Subject: [PATCH] Attempt to push to GHCR

---
 .github/actions/build_container/action.yaml | 2 ++
 .github/workflows/spacktainer.yaml          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/actions/build_container/action.yaml b/.github/actions/build_container/action.yaml
index d38a674..6c6cce2 100644
--- a/.github/actions/build_container/action.yaml
+++ b/.github/actions/build_container/action.yaml
@@ -59,3 +59,5 @@ runs:
         eval "${COMMAND}"
         # Sometimes buildah push fails on the first attempt
         buildah push $(<image_id) "docker://${{ inputs.AWS_ECR_URL }}${{ inputs.AWS_ECR_PATH }}:${REGISTRY_IMAGE_TAG}" || sleep 10; buildah push $(<image_id) "docker://${{ inputs.AWS_ECR_URL }}${{ inputs.AWS_ECR_PATH }}:${REGISTRY_IMAGE_TAG}"
+        # Also push to ghcr
+        buildah push $(<image_id) "docker://ghcr.io${{ inputs.GHCR_PATH }}:${REGISTRY_IMAGE_TAG}" || sleep 10; buildah push $(<image_id) "docker://ghcr.io${{ inputs.GHCR_PATH }}:${REGISTRY_IMAGE_TAG}"
diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
index 9ab06bd..350ef2c 100644
--- a/.github/workflows/spacktainer.yaml
+++ b/.github/workflows/spacktainer.yaml
@@ -16,6 +16,7 @@ jobs:
           AWS_ECR_PATH: /spacktainers/builder
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
+          GHCR_PATH: /BlueBrain/spack-builder
           BUILD_PATH: builder
           BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
             --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label
@@ -43,6 +44,7 @@ jobs:
           AWS_ECR_PATH: /spacktainers/runtime
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
+          GHCR_PATH: /BlueBrain/spack-runtime
           BUILD_PATH: runtime
           BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
             --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label
@@ -95,6 +97,7 @@ jobs:
           AWS_ECR_PATH: /spacktainers/${{ matrix.spacktainer }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
+          GHCR_PATH: /BlueBrain/spack-${{ matrix.spacktainer }}
           BUILD_PATH: container_definitions/amd64/${{ matrix.spacktainer }}
           BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
             --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label