From 0a0e833fcbcafa4262e9ab10d15a33df3a1abc11 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sun, 5 Nov 2023 00:03:23 +0100 Subject: [PATCH] Fix quay.io naming --- .github/workflows/docker.yml | 4 ++-- README.md | 6 +++--- tests/base-notebook/test_packages.py | 11 +++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d8cb21aa..a65280d8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,8 +1,8 @@ name: Build, test and push Docker Images # [FAST_BUILD] in the PR title makes this workflow only build -# `jupyter/docker-stacks-foundation` and `/jupyter/base-notebook` in the PR -# This allows to run CI faster in case where full build is not required +# `jupyter/docker-stacks-foundation` and `jupyter/base-notebook` +# This allows to run CI faster if full build is not required # This only works for `pull_request` event and has no effect on `push` to the `main` branch on: diff --git a/README.md b/README.md index 0649bb00..1fd05eb2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Read the Docs badge](https://img.shields.io/readthedocs/jupyter-docker-stacks.svg)](https://jupyter-docker-stacks.readthedocs.io/en/latest/ "Documentation build status") [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/jupyter/docker-stacks/main.svg)](https://results.pre-commit.ci/latest/github/jupyter/docker-stacks/main "pre-commit.ci build status") [![Discourse badge](https://img.shields.io/discourse/users.svg?color=%23f37626&server=https%3A%2F%2Fdiscourse.jupyter.org)](https://discourse.jupyter.org/ "Jupyter Discourse Forum") -[![Binder badge](https://static.mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter/docker-stacks/main?urlpath=lab/tree/README.ipynb "Launch a jupyter/base-notebook container on mybinder.org") +[![Binder badge](https://static.mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter/docker-stacks/main?urlpath=lab/tree/README.ipynb "Launch a quay.io/jupyter/base-notebook container on mybinder.org") Jupyter Docker Stacks are a set of ready-to-run [Docker images](https://quay.io/organization/jupyter) containing Jupyter applications and interactive computing tools. You can use a stack image to do any of the following (and more): @@ -17,7 +17,7 @@ You can use a stack image to do any of the following (and more): ## Quick Start -You can try a [relatively recent build of the jupyter/base-notebook image on mybinder.org](https://mybinder.org/v2/gh/jupyter/docker-stacks/main?urlpath=lab/tree/README.ipynb) +You can try a [relatively recent build of the quay.io/jupyter/base-notebook image on mybinder.org](https://mybinder.org/v2/gh/jupyter/docker-stacks/main?urlpath=lab/tree/README.ipynb) by simply clicking the preceding link. Otherwise, the examples below may help you get started if you [have Docker installed](https://docs.docker.com/get-docker/), know [which Docker image](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html) you want to use @@ -87,7 +87,7 @@ more information is available in the [documentation](https://jupyter-docker-stac ## CPU Architectures - We publish containers for both `x86_64` and `aarch64` platforms -- Single-platform images have either `aarch64-` or `x86_64-` tag prefixes, for example, `jupyter/base-notebook:aarch64-python-3.10.5` +- Single-platform images have either `aarch64-` or `x86_64-` tag prefixes, for example, `quay.io/jupyter/base-notebook:aarch64-python-3.10.5` - Starting from `2022-09-21`, we create multi-platform images (except `tensorflow-notebook`) - Starting from `2023-06-01`, we create multi-platform `tensorflow-notebook` image as well diff --git a/tests/base-notebook/test_packages.py b/tests/base-notebook/test_packages.py index ae4fa3f1..a049c9c3 100644 --- a/tests/base-notebook/test_packages.py +++ b/tests/base-notebook/test_packages.py @@ -24,15 +24,14 @@ Example: $ make test/base-notebook # [...] - # test/test_packages.py::test_python_packages # tests/base-notebook/test_packages.py::test_python_packages # ---------------------------------------------------------------------------------------------- live log setup ---------------------------------------------------------------------------------------------- - # 2022-02-17 16:44:36 [ INFO] Starting container jupyter/base-notebook ... (package_helper.py:55) - # 2022-02-17 16:44:36 [ INFO] Running jupyter/base-notebook with args {'detach': True, 'tty': True, 'command': ['start.sh', 'bash', '-c', 'sleep infinity']} ... (conftest.py:95) - # 2022-02-17 16:44:37 [ INFO] Grabbing the list of manually requested packages ... (package_helper.py:83) + # 2023-11-04 23:59:01 [ INFO] Starting container quay.io/jupyter/base-notebook ... (package_helper.py:55) + # 2023-11-04 23:59:01 [ INFO] Running quay.io/jupyter/base-notebook with args {'detach': True, 'tty': True, 'command': ['start.sh', 'bash', '-c', 'sleep infinity']} ... (conftest.py:99) + # 2023-11-04 23:59:01 [ INFO] Grabbing the list of manually requested packages ... (package_helper.py:83) # ---------------------------------------------------------------------------------------------- live log call ----------------------------------------------------------------------------------------------- - # 2022-02-17 16:44:38 [ INFO] Testing the import of packages ... (test_packages.py:144) - # 2022-02-17 16:44:38 [ INFO] Trying to import mamba (test_packages.py:146) + # 2023-11-04 23:59:02 [ INFO] Testing the import of packages ... (test_packages.py:152) + # 2023-11-04 23:59:02 [ INFO] Trying to import mamba (test_packages.py:154) # [...] """