Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch default image to quay.io #504

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Switch default image to quay.io #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockerspawner/dockerspawner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@ def _ip_default(self):
return "0.0.0.0"

container_image = Unicode(
"jupyterhub/singleuser:%s" % _jupyterhub_xy,
"quay.io/jupyterhub/singleuser:%s" % _jupyterhub_xy,
help="Deprecated, use ``DockerSpawner.image``.",
config=True,
)

image = Unicode(
"jupyterhub/singleuser:%s" % _jupyterhub_xy,
"quay.io/jupyterhub/singleuser:%s" % _jupyterhub_xy,
config=True,
help="""The image to use for single-user servers.

Expand Down
14 changes: 7 additions & 7 deletions docs/source/docker-image.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Picking or building a Docker image

By default, DockerSpawner uses the `jupyterhub/singleuser` image
By default, DockerSpawner uses the `quay.io/jupyterhub/singleuser` image
with the appropriate tag that pins the right version of JupyterHub,
but you can also build your own image.

Expand All @@ -13,7 +13,7 @@ and are encouraged as the image of choice. Make sure to pick a tag!
Example:

```python
c.DockerSpawner.image = 'jupyter/scipy-notebook:67b8fb91f950'
c.DockerSpawner.image = 'quay.io/jupyter/scipy-notebook:2023-10-23'
```

The docker-stacks are moving targets with always changing versions.
Expand All @@ -37,8 +37,8 @@ the appropriate JupyterHub version and the Jupyter notebook package.
For instance, from the docker-stacks, pin your JupyterHub version and you are done:

```Dockerfile
FROM jupyter/scipy-notebook:67b8fb91f950
ARG JUPYTERHUB_VERSION=1.3.0
FROM quay.io/jupyter/scipy-notebook:67b8fb91f950
ARG JUPYTERHUB_VERSION=4.0.2
RUN pip3 install --no-cache \
jupyterhub==$JUPYTERHUB_VERSION
```
Expand All @@ -48,10 +48,10 @@ Or for the absolute minimal JupyterHub user image starting only from the base Py
**NOTE: make sure to pick the jupyterhub version you are using!**

```Dockerfile
FROM python:3.8
FROM python:3.11
RUN pip3 install \
'jupyterhub==1.3.*' \
'notebook==6.*'
'jupyterhub==4.*' \
'notebook==7.*'

# create a user, since we don't want to run as root
RUN useradd -m jovyan
Expand Down
2 changes: 1 addition & 1 deletion examples/internal-ssl/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DOCKER_MACHINE_NAME=jupyterhub
DOCKER_NETWORK_NAME=jupyterhub

# Single-user Jupyter Notebook server container image
DOCKER_NOTEBOOK_IMAGE=jupyterhub/singleuser:4
DOCKER_NOTEBOOK_IMAGE=quay.io/jupyterhub/singleuser:4

# Name of JupyterHub container data volume
DATA_VOLUME_HOST=jupyterhub-data
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def app(jupyterhub_app): # noqa: F811
# If it's a prerelease e.g. (2, 0, 0, 'rc4', '') use full tag
if len(jh_version_info) > 3 and jh_version_info[3]:
tag = jupyterhub.__version__
app.config.DockerSpawner.image = f"jupyterhub/singleuser:{tag}"
app.config.DockerSpawner.image = f"quay.io/jupyterhub/singleuser:{tag}"
return app


Expand Down