Skip to content

Commit

Permalink
Move to quay.io
Browse files Browse the repository at this point in the history
I've also put in appropriate secrets for QUAY_USERNAME and
QUAY_PASSWORD

Ref jupyterhub/team-compass#688
  • Loading branch information
yuvipanda committed Oct 26, 2023
1 parent 729ac45 commit 7baa4b8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 13 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/binderhub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nodeSelector: {}
tolerations: []

image:
name: jupyterhub/k8s-binderhub
name: quay.io/jupyterhub/k8s-binderhub
tag: "set-by-chartpress"
pullPolicy: ""
pullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/images/binderhub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7baa4b8

Please sign in to comment.