Skip to content

Commit f366b78

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 26a7444 commit f366b78

File tree

11 files changed

+28
-32
lines changed

11 files changed

+28
-32
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

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[![Latest conda-forge version](https://img.shields.io/conda/vn/conda-forge/jupyterhub?logo=conda-forge)](https://anaconda.org/conda-forge/jupyterhub)
1515
[![Documentation build status](https://img.shields.io/readthedocs/jupyterhub?logo=read-the-docs)](https://jupyterhub.readthedocs.org/en/latest/)
1616
[![GitHub Workflow Status - Test](https://img.shields.io/github/workflow/status/jupyterhub/jupyterhub/Test?logo=github&label=tests)](https://github.com/jupyterhub/jupyterhub/actions)
17-
[![DockerHub build status](https://img.shields.io/docker/build/jupyterhub/jupyterhub?logo=docker&label=build)](https://hub.docker.com/r/jupyterhub/jupyterhub/tags)
17+
[![Docker Repository on Quay](https://quay.io/repository/jupyterhub/jupyterhub/status "Docker Repository on Quay")](https://quay.io/repository/jupyterhub/jupyterhub)
1818
[![Test coverage of code](https://codecov.io/gh/jupyterhub/jupyterhub/branch/main/graph/badge.svg)](https://codecov.io/gh/jupyterhub/jupyterhub)
1919
[![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/jupyterhub/issues)
2020
[![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub)
@@ -160,18 +160,18 @@ To start the Hub on a specific url and port `10.0.1.2:443` with **https**:
160160

161161
## Docker
162162

163-
A starter [**docker image for JupyterHub**](https://hub.docker.com/r/jupyterhub/jupyterhub/)
163+
A starter [**docker image for JupyterHub**](https://quay.io/repository/jupyterhub/jupyterhub)
164164
gives a baseline deployment of JupyterHub using Docker.
165165

166-
**Important:** This `jupyterhub/jupyterhub` image contains only the Hub itself,
166+
**Important:** This `quay.io/jupyterhub/jupyterhub` image contains only the Hub itself,
167167
with no configuration. In general, one needs to make a derivative image, with
168168
at least a `jupyterhub_config.py` setting up an Authenticator and/or a Spawner.
169169
To run the single-user servers, which may be on the same system as the Hub or
170170
not, Jupyter Notebook version 4 or greater must be installed.
171171

172172
The JupyterHub docker image can be started with the following command:
173173

174-
docker run -p 8000:8000 -d --name jupyterhub jupyterhub/jupyterhub jupyterhub
174+
docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub
175175

176176
This command will create a container named `jupyterhub` that you can
177177
**stop and resume** with `docker stop/start`.

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

docs/source/faq/troubleshooting.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ things like inspect other users' servers or modify the user list at runtime).
4646
### JupyterHub Docker container is not accessible at localhost
4747

4848
Even though the command to start your Docker container exposes port 8000
49-
(`docker run -p 8000:8000 -d --name jupyterhub jupyterhub/jupyterhub jupyterhub`),
49+
(`docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub`),
5050
it is possible that the IP address itself is not accessible/visible. As a result,
5151
when you try http://localhost:8000 in your browser, you are unable to connect
5252
even though the container is running properly. One workaround is to explicitly
5353
tell Jupyterhub to start at `0.0.0.0` which is visible to everyone. Try this
5454
command:
55-
`docker run -p 8000:8000 -d --name jupyterhub jupyterhub/jupyterhub jupyterhub --ip 0.0.0.0 --port 8000`
55+
`docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub --ip 0.0.0.0 --port 8000`
5656

5757
### How can I kill ports from JupyterHub-managed services that have been orphaned?
5858

@@ -347,12 +347,12 @@ In order to resolve this issue, there are two potential options.
347347

348348
### Where do I find Docker images and Dockerfiles related to JupyterHub?
349349

350-
Docker images can be found at the [JupyterHub organization on DockerHub](https://hub.docker.com/u/jupyterhub/).
351-
The Docker image [jupyterhub/singleuser](https://hub.docker.com/r/jupyterhub/singleuser/)
350+
Docker images can be found at the [JupyterHub organization on quay.io](https://quay.io/organization/jupyterhub).
351+
The Docker image [jupyterhub/singleuser](https://quay.io/repository/jupyterhub/singleuser)
352352
provides an example single-user notebook server for use with DockerSpawner.
353353

354354
Additional single-user notebook server images can be found at the [Jupyter
355-
organization on DockerHub](https://hub.docker.com/r/jupyter/) and information
355+
organization on quay.io](https://quay.io/organization/jupyter) and information
356356
about each image at the [jupyter/docker-stacks repo](https://github.com/jupyter/docker-stacks).
357357

358358
### How can I view the logs for JupyterHub or the user's Notebook servers when using the DockerSpawner?

docs/source/howto/separate-proxy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ need to configure the options there.
7070
## Docker image
7171

7272
You can use [jupyterhub configurable-http-proxy docker
73-
image](https://hub.docker.com/r/jupyterhub/configurable-http-proxy/)
73+
image](https://quay.io/repository/jupyterhub/configurable-http-proxy)
7474
to run the proxy.
7575

7676
## See also

docs/source/tutorial/quickstart-docker.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Install JupyterHub with Docker
22

3-
The JupyterHub [docker image](https://hub.docker.com/r/jupyterhub/jupyterhub/) is the fastest way to set up Jupyterhub in your local development environment.
3+
The JupyterHub [docker image](https://quay.io/repository/jupyterhub/jupyterhub) is the fastest way to set up Jupyterhub in your local development environment.
44

55
:::{note}
6-
This `jupyterhub/jupyterhub` docker image is only an image for running
6+
This `quay.io/jupyterhub/jupyterhub` docker image is only an image for running
77
the Hub service itself. It does not provide the other Jupyter components,
88
such as Notebook installation, which are needed by the single-user servers.
99
To run the single-user servers, which may be on the same system as the Hub or
@@ -24,7 +24,7 @@ You should have [Docker] installed on a Linux/Unix based system.
2424
To pull the latest JupyterHub image and start the `jupyterhub` container, run this command in your terminal.
2525

2626
```
27-
docker run -d -p 8000:8000 --name jupyterhub jupyterhub/jupyterhub jupyterhub
27+
docker run -d -p 8000:8000 --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub
2828
```
2929

3030
This command exposes the Jupyter container on port:8000. Navigate to `http://localhost:8000` in a web browser to access the JupyterHub console.

examples/service-fastapi/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM jupyterhub/jupyterhub
1+
FROM quay.io/jupyterhub/jupyterhub
22

3-
# Create test user (PAM auth) and install single-user Jupyter
3+
# Create test user (PAM auth) and install single-user Jupyter
44
RUN useradd testuser --create-home --shell /bin/bash
55
RUN echo 'testuser:passwd' | chpasswd
6-
RUN pip install jupyter
6+
RUN pip install jupyter
77

88
COPY app ./app
99
COPY jupyterhub_config.py .

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)