From 7baa4b856361b9e933aa774e979afb3c976c7420 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 26 Oct 2023 11:22:09 +0530
Subject: [PATCH] Move to quay.io

I've also put in appropriate secrets for QUAY_USERNAME and
QUAY_PASSWORD

Ref https://github.com/jupyterhub/team-compass/issues/688
---
 .github/workflows/publish.yml          | 17 +++++++----------
 helm-chart/binderhub/values.yaml       |  2 +-
 helm-chart/chartpress.yaml             |  2 +-
 helm-chart/images/binderhub/Dockerfile |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index eaa95c94e..6cb3ac229 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,12 +24,12 @@ on:
   workflow_dispatch:
 
 jobs:
-  # Builds and pushes docker images to DockerHub, packages the Helm chart and
+  # Builds and pushes docker images to quay.io, packages the Helm chart and
   # pushes it to jupyterhub/helm-chart@gh-pages where index.yaml represents the
   # JupyterHub organization Helm chart repository.
   #
   # ref: https://github.com/jupyterhub/helm-chart
-  # ref: https://hub.docker.com/orgs/jupyterhub
+  # ref: https://quay.io/organization/jupyterhub
   #
   Publish:
     runs-on: ubuntu-latest
@@ -83,15 +83,12 @@ jobs:
 
       - name: Setup push rights to Docker Hub
         # This was setup by...
-        # 1. Creating a Docker Hub service account "jupyterhubbot"
-        # 2. Making the account part of the "bots" team, and granting that team
-        #    permissions to push to the relevant images:
-        #    https://hub.docker.com/orgs/jupyterhub/teams/bots/permissions
-        # 3. Registering the username and password as a secret for this repo:
-        #    https://github.com/jupyterhub/binderhub/settings/secrets/actions
-        #
+        # 1. Creating a [Robot Account](https://quay.io/organization/jupyterhub?tab=robots) in the JupyterHub
+        # .  quay.io org
+        # 2. Giving it enough permissions to push to the binderhub image
+        # 3. Putting the robot account's username and password in GitHub actions environment
         run: |
-          docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}"
+          docker login -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}" quay.io
 
       - name: Configure a git user
         # Having a user.email and user.name configured with git is required to
diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
index d95031eba..a97501ad9 100644
--- a/helm-chart/binderhub/values.yaml
+++ b/helm-chart/binderhub/values.yaml
@@ -17,7 +17,7 @@ nodeSelector: {}
 tolerations: []
 
 image:
-  name: jupyterhub/k8s-binderhub
+  name: quay.io/jupyterhub/k8s-binderhub
   tag: "set-by-chartpress"
   pullPolicy: ""
   pullSecrets: []
diff --git a/helm-chart/chartpress.yaml b/helm-chart/chartpress.yaml
index 18f4e3b9c..79526391f 100644
--- a/helm-chart/chartpress.yaml
+++ b/helm-chart/chartpress.yaml
@@ -6,7 +6,7 @@
 charts:
   - name: binderhub
     baseVersion: 1.0.0-0.dev
-    imagePrefix: jupyterhub/k8s-
+    imagePrefix: quay.io/jupyterhub/k8s-
     repo:
       git: jupyterhub/helm-chart
       published: https://jupyterhub.github.io/helm-chart
diff --git a/helm-chart/images/binderhub/Dockerfile b/helm-chart/images/binderhub/Dockerfile
index 4d6cfaabc..336992da0 100644
--- a/helm-chart/images/binderhub/Dockerfile
+++ b/helm-chart/images/binderhub/Dockerfile
@@ -30,7 +30,7 @@ RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
 
 # The final stage
 # ---------------
-# This stage is built and published as jupyterhub/k8s-binderhub.
+# This stage is built and published as quay.io/jupyterhub/k8s-binderhub.
 #
 FROM python:3.11-slim-bullseye