From bff3d01943d89b06c647589bbbffe507a62c20ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 03:06:08 +0000 Subject: [PATCH 1/2] Update Dask version to 2024.1.1 --- .github/workflows/build.yml | 2 +- README.md | 16 ++++++++-------- build/docker-compose.yml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8cbb48f..57754d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest env: - release: "2024.1.0" + release: "2024.1.1" defaultpython: "3.10" strategy: diff --git a/README.md b/README.md index 57de795..6b7cb5c 100644 --- a/README.md +++ b/README.md @@ -8,15 +8,15 @@ | `ghcr.io/dask/dask-notebook` | Jupyter Notebook image to use as helper entrypoint | [![][daskdev-dask-notebook-py310-release] ![][daskdev-dask-notebook-release] ![][daskdev-dask-notebook-latest]
![][daskdev-dask-notebook-py39-release]
![][daskdev-dask-notebook-py311-release]](https://github.com/dask/dask-docker/pkgs/container/dask-notebook) | [daskdev-dask-latest]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-latest-blue -[daskdev-dask-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.0-blue -[daskdev-dask-py39-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.0--py3.9-blue -[daskdev-dask-py310-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.0--py3.10-blue -[daskdev-dask-py311-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.0--py3.11-blue +[daskdev-dask-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.1-blue +[daskdev-dask-py39-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.1--py3.9-blue +[daskdev-dask-py310-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.1--py3.10-blue +[daskdev-dask-py311-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask-2024.1.1--py3.11-blue [daskdev-dask-notebook-latest]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-latest-blue -[daskdev-dask-notebook-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.0-blue -[daskdev-dask-notebook-py39-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.0--py3.9-blue -[daskdev-dask-notebook-py310-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.0--py3.10-blue -[daskdev-dask-notebook-py311-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.0--py3.11-blue +[daskdev-dask-notebook-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.1-blue +[daskdev-dask-notebook-py39-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.1--py3.9-blue +[daskdev-dask-notebook-py310-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.1--py3.10-blue +[daskdev-dask-notebook-py311-release]: https://img.shields.io/badge/ghcr.io%2Fdask%2Fdask--notebook-2024.1.1--py3.11-blue ## Example diff --git a/build/docker-compose.yml b/build/docker-compose.yml index 91c840c..10cb15b 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -6,7 +6,7 @@ services: context: ../base dockerfile: Dockerfile args: - release: "2024.1.0" + release: "2024.1.1" image: ghcr.io/dask/dask:latest hostname: dask-scheduler ports: @@ -28,7 +28,7 @@ services: dockerfile: Dockerfile args: python: "3.10" - release: "2024.1.0" + release: "2024.1.1" image: ghcr.io/dask/dask:latest hostname: dask-worker command: [ "dask-worker", "tcp://scheduler:8786" ] @@ -40,7 +40,7 @@ services: args: base: daskdev python: "3.10" - release: "2024.1.0" + release: "2024.1.1" depends_on: - docker-stacks-foundation image: ghcr.io/dask/dask-notebook:latest From 7d22b9a1e8c6bfcf6381481ce2bdf71463bb5fe1 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Fri, 26 Jan 2024 22:33:28 -0600 Subject: [PATCH 2/2] Pin mambaforge image --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 27876f6..55416d5 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_CONTAINER=condaforge/mambaforge:latest +ARG BASE_CONTAINER=condaforge/mambaforge:23.3.1-1 FROM $BASE_CONTAINER ARG python="3.10"