Update versions, put username in dask pod name (#128)

dask 0.17.1 distributed 1.21.1 daskernetes 0.1.3 Also set OMP_NUM_THREADS to 1 in workers to avoid BLAS conflicts
pangeo-data · Feb 22, 2018 · ab21a99 · ab21a99
1 parent 3c8e3e8
commit ab21a99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/gce/notebook/Dockerfile b/gce/notebook/Dockerfile
@@ -33,13 +33,14 @@ RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager @jupyterlab
 
 RUN pip install fusepy click jedi kubernetes --upgrade --no-cache-dir
 
-RUN pip install git+https://github.com/dask/daskernetes \
+RUN pip install daskernetes==0.1.3 \
                 git+https://github.com/zarr-developers/zarr \
                 git+https://github.com/pydata/xarray \
                 git+https://github.com/dask/gcsfs \
                 --no-cache-dir
 
-RUN pip install git+https://github.com/dask/distributed.git@bc436e242884a1d4cf3a85ce6d5d378b5663122d \
+RUN pip install distributed==1.21.1 \
+                dask==0.17.1 \
                 --no-dependencies \ 
                 --no-cache-dir
 
@@ -55,6 +56,7 @@ COPY worker-template.yaml /pre-home
 COPY examples/ /pre-home/examples/
 ENV DASKERNETES_WORKER_TEMPLATE_PATH /home/$NB_USER/worker-template.yaml
 ENV DASKERNETES_DIAGNOSTICS_LINK {JUPYTERHUB_SERVICE_PREFIX}proxy/{port}/status
+ENV DASKERNETES_WORKER_NAME dask-{JUPYTERHUB_USER}-{uuid}
 RUN mkdir /gcs && chown -R $NB_USER /gcs
 RUN mkdir /opt/app
 

diff --git a/gce/notebook/worker-template.yaml b/gce/notebook/worker-template.yaml
@@ -3,7 +3,7 @@ spec:
   restartPolicy: Never
   containers:
   - args: [dask-worker, --nthreads, '2', --no-bokeh, --memory-limit, 7GB, --death-timeout, '60']
-    image: daskdev/pangeo-worker:2018-02-14
+    image: daskdev/pangeo-worker:2018-02-22
     name: dask-worker
     securityContext:
       capabilities:

diff --git a/gce/worker/Dockerfile b/gce/worker/Dockerfile
@@ -36,10 +36,13 @@ RUN pip install git+https://github.com/zarr-developers/zarr \
                 fusepy \
                 --no-cache-dir
 
-RUN pip install git+https://github.com/dask/distributed.git@bc436e242884a1d4cf3a85ce6d5d378b5663122d \
+RUN pip install distributed==1.21.1 \
+                dask==0.17.1 \
                 --no-dependencies \ 
                 --no-cache-dir
 
+ENV OMP_NUM_THREADS=1
+
 USER root
 COPY prepare.sh /usr/bin/prepare.sh
 RUN chmod +x /usr/bin/prepare.sh