From b647787822323953d727d096a5cb82b85d8ddfc6 Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Wed, 11 Sep 2024 15:11:48 -0700
Subject: [PATCH 1/2] pin repo2docker at 2024.07.0

---
 .github/workflows/build-push-image-commit.yaml | 3 ++-
 .github/workflows/build-test-image.yaml        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-push-image-commit.yaml b/.github/workflows/build-push-image-commit.yaml
index 3c3d7f5..5c3dcbb 100644
--- a/.github/workflows/build-push-image-commit.yaml
+++ b/.github/workflows/build-push-image-commit.yaml
@@ -48,6 +48,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: jupyterhub/repo2docker-action@master
         with:
+          FORCE_REPO2DOCKER_VERSION: repo2docker==2024.07.0
           DOCKER_REGISTRY: us-central1-docker.pkg.dev
           IMAGE_NAME: ${{ env.IMAGE }}
           # Disable pushing a 'latest' tag, as this often just causes confusion
@@ -94,7 +95,7 @@ jobs:
           for deployment in $(grep -lr ${IMAGE} deployments/ | grep hubploy.yaml); do
             old_hash=$(grep ${IMAGE} ${deployment} | awk -F":" '{print $3}')
             new_hash=${IMAGE_TAG}
-            sed -i -e "s/${old_hash}/${new_hash}/g" ${deployment}
+            sed -i -e "s,${IMAGE}:${old_hash},${IMAGE}:${new_hash},g" ${deployment}
             echo "Updated ${deployment} with new image tag ${new_hash}"
           done
 
diff --git a/.github/workflows/build-test-image.yaml b/.github/workflows/build-test-image.yaml
index c28fd9d..3ba77e0 100644
--- a/.github/workflows/build-test-image.yaml
+++ b/.github/workflows/build-test-image.yaml
@@ -40,6 +40,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: jupyterhub/repo2docker-action@master
         with:
+          FORCE_REPO2DOCKER_VERSION: repo2docker==2024.07.0
           REPO_DIR: /srv/repo
           NO_PUSH: true
 

From e81a85c6eb0a268f3f99919781728969fc082e9c Mon Sep 17 00:00:00 2001
From: shane knapp <incomplete@gmail.com>
Date: Wed, 11 Sep 2024 15:39:10 -0700
Subject: [PATCH 2/2] fix package name

---
 .github/workflows/build-push-image-commit.yaml | 2 +-
 .github/workflows/build-test-image.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-push-image-commit.yaml b/.github/workflows/build-push-image-commit.yaml
index 5c3dcbb..b998620 100644
--- a/.github/workflows/build-push-image-commit.yaml
+++ b/.github/workflows/build-push-image-commit.yaml
@@ -48,7 +48,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: jupyterhub/repo2docker-action@master
         with:
-          FORCE_REPO2DOCKER_VERSION: repo2docker==2024.07.0
+          FORCE_REPO2DOCKER_VERSION: jupyter-repo2docker==2024.07.0
           DOCKER_REGISTRY: us-central1-docker.pkg.dev
           IMAGE_NAME: ${{ env.IMAGE }}
           # Disable pushing a 'latest' tag, as this often just causes confusion
diff --git a/.github/workflows/build-test-image.yaml b/.github/workflows/build-test-image.yaml
index 3ba77e0..097baa7 100644
--- a/.github/workflows/build-test-image.yaml
+++ b/.github/workflows/build-test-image.yaml
@@ -40,7 +40,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: jupyterhub/repo2docker-action@master
         with:
-          FORCE_REPO2DOCKER_VERSION: repo2docker==2024.07.0
+          FORCE_REPO2DOCKER_VERSION: jupyter-repo2docker==2024.07.0
           REPO_DIR: /srv/repo
           NO_PUSH: true