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

Update Dask version to 2022.2.1 #205

Merged
merged 3 commits into from
Feb 28, 2022
Merged

Update Dask version to 2022.2.1 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f618325
Update Dask version to 2022.2.1
jsignell Feb 25, 2022
6012af9
Have conda import from conda-forge and move python install up
jsignell Feb 28, 2022
0204d32
Update miniconda docker image
jrbourbeau Feb 28, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

env:
release: "2022.2.0"
release: "2022.2.1"
defaultpython: "3.8"

strategy:
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
| `daskdev/dask-notebook` | Jupyter Notebook image to use as helper entrypoint | [![][daskdev-dask-notebook-py38-release] ![][daskdev-dask-notebook-release] ![][daskdev-dask-notebook-latest] <br /> ![][daskdev-dask-notebook-py39-release]](https://hub.docker.com/r/daskdev/dask-notebook/tags) |

[daskdev-dask-latest]: https://img.shields.io/badge/daskdev%2Fdask-latest-blue
[daskdev-dask-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.0-blue
[daskdev-dask-py38-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.0--py3.8-blue
[daskdev-dask-py39-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.0--py3.9-blue
[daskdev-dask-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.1-blue
[daskdev-dask-py38-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.1--py3.8-blue
[daskdev-dask-py39-release]: https://img.shields.io/badge/daskdev%2Fdask-2022.2.1--py3.9-blue
[daskdev-dask-notebook-latest]: https://img.shields.io/badge/daskdev%2Fdask--notebook-latest-blue
[daskdev-dask-notebook-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.0-blue
[daskdev-dask-notebook-py38-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.0--py3.8-blue
[daskdev-dask-notebook-py39-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.0--py3.9-blue
[daskdev-dask-notebook-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.1-blue
[daskdev-dask-notebook-py38-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.1--py3.8-blue
[daskdev-dask-notebook-py39-release]: https://img.shields.io/badge/daskdev%2Fdask--notebook-2022.2.1--py3.9-blue


## Example
Expand Down
6 changes: 2 additions & 4 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_CONTAINER=condaforge/miniforge3:4.10.3-2
ARG BASE_CONTAINER=condaforge/miniforge3:4.11.0-4
FROM $BASE_CONTAINER

ARG python=3.8
Expand All @@ -10,10 +10,8 @@ ENV PATH /opt/conda/bin:$PATH
ENV PYTHON_VERSION=${python}
ENV DASK_VERSION=${release}

RUN conda install --yes nomkl cytoolz cmake \
&& conda install --yes mamba \
RUN conda install --yes -c conda-forge nomkl cytoolz cmake mamba python=${PYTHON_VERSION} \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the python install up, and added conda-forge to this line to make sure we don't have different channels.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm that doesn't seem to have quite done it.

&& mamba install --yes -c conda-forge \
python=${PYTHON_VERSION} \
python-blosc \
cytoolz \
dask==${DASK_VERSION} \
Expand Down
6 changes: 3 additions & 3 deletions build/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: ../base
dockerfile: Dockerfile
args:
release: "2022.2.0"
release: "2022.2.1"
image: daskdev/dask:latest
hostname: dask-scheduler
ports:
Expand All @@ -28,7 +28,7 @@ services:
dockerfile: Dockerfile
args:
python: "3.8"
release: "2022.2.0"
release: "2022.2.1"
image: daskdev/dask:latest
hostname: dask-worker
command: ["dask-worker", "tcp://scheduler:8786"]
Expand All @@ -40,7 +40,7 @@ services:
args:
base: daskdev
python: "3.8"
release: "2022.2.0"
release: "2022.2.1"
depends_on:
- base-notebook
image: daskdev/dask-notebook:latest
Expand Down