Skip to content

Commit e679a98

Browse files
committed
Move from dockerhub to quay.io
See jupyterhub/team-compass#688 for context. I've also added `QUAY_USERNAME` and `QUAY_PASSWORD` to environment secrets, but *not* `env.REGISTRY`. I will do so once this gets merged.
1 parent 87edbe5 commit e679a98

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

.github/workflows/release.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,13 @@ jobs:
119119

120120
- name: Setup push rights to Docker Hub
121121
# This was setup by...
122-
# 1. Creating a Docker Hub service account "jupyterhubbot"
123-
# 2. Creating a access token for the service account specific to this
124-
# repository: https://hub.docker.com/settings/security
125-
# 3. Making the account part of the "bots" team, and granting that team
126-
# permissions to push to the relevant images:
127-
# https://hub.docker.com/orgs/jupyterhub/teams/bots/permissions
128-
# 4. Registering the username and token as a secret for this repo:
129-
# https://github.com/jupyterhub/jupyterhub/settings/secrets/actions
122+
# 1. Creating a [Robot Account](https://quay.io/organization/jupyterhub?tab=robots) in the JupyterHub
123+
# . quay.io org
124+
# 2. Giving it enough permissions to push to the jupyterhub and singleuser images
125+
# 3. Putting the robot account's username and password in GitHub actions environment
130126
if: env.REGISTRY != 'localhost:5000/'
131127
run: |
132-
docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}"
128+
docker login -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}" "${{ env.REGISTRY }}"
133129
134130
# image: jupyterhub/jupyterhub
135131
#

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
#
77
# Option 1:
88
#
9-
# FROM jupyterhub/jupyterhub:latest
9+
# FROM quay.io/jupyterhub/jupyterhub:latest
1010
#
1111
# And put your configuration file jupyterhub_config.py in /srv/jupyterhub/jupyterhub_config.py.
1212
#
1313
# Option 2:
1414
#
1515
# Or you can create your jupyterhub config and database on the host machine, and mount it with:
1616
#
17-
# docker run -v $PWD:/srv/jupyterhub -t jupyterhub/jupyterhub
17+
# docker run -v $PWD:/srv/jupyterhub -t quay.io/jupyterhub/jupyterhub
1818
#
1919
# NOTE
20-
# If you base on jupyterhub/jupyterhub-onbuild
20+
# If you base on quay.io/jupyterhub/jupyterhub-onbuild
2121
# your jupyterhub_config.py will be added automatically
2222
# from your docker directory.
2323

demo-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This should only be used for demo or testing and not as a base image to build on.
44
#
55
# It includes the notebook package and it uses the DummyAuthenticator and the SimpleLocalProcessSpawner.
6-
ARG BASE_IMAGE=jupyterhub/jupyterhub-onbuild
6+
ARG BASE_IMAGE=quay.io/jupyterhub/jupyterhub-onbuild
77
FROM ${BASE_IMAGE}
88

99
# Install the notebook package

onbuild/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Derivative images must have jupyterhub_config.py next to the Dockerfile.
66

7-
ARG BASE_IMAGE=jupyterhub/jupyterhub:latest
7+
ARG BASE_IMAGE=quay.io/jupyterhub/jupyterhub:latest
88
FROM $BASE_IMAGE
99

1010
ONBUILD COPY jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py

onbuild/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
If you base a Dockerfile on this image:
44

5-
FROM jupyterhub/jupyterhub-onbuild:1.4.0
5+
FROM quay.io/jupyterhub/jupyterhub-onbuild:1.4.0
66
...
77

88
then your `jupyterhub_config.py` adjacent to your Dockerfile will be loaded into the image and used by JupyterHub.

singleuser/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build as jupyterhub/singleuser
22
# Run with the DockerSpawner in JupyterHub
33

4-
ARG BASE_IMAGE=jupyter/base-notebook
4+
ARG BASE_IMAGE=quay.io/jupyter/base-notebook
55
FROM $BASE_IMAGE
66
MAINTAINER Project Jupyter <[email protected]>
77

0 commit comments

Comments
 (0)