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

Jump to bottom

Clean Jupyter Cache #312

Merged
merged 3 commits into from
Apr 23, 2021
Merged

Clean Jupyter Cache #312

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
60916ec
change npm version spec due to bugs
ajschmidt8 Apr 23, 2021
4975a45
clean jupyter cache
ajschmidt8 Apr 23, 2021
cb131f4
regenerate docker files
ajschmidt8 Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions generated-dockerfiles/rapidsai-core_centos7-base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_centos7-devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand All @@ -70,7 +69,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_centos7-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand All @@ -57,7 +56,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
3 changes: 1 addition & 2 deletions generated-dockerfiles/rapidsai-core_centos8-base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_centos8-devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand All @@ -70,7 +69,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_centos8-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN yum -y upgrade \
&& yum clean all
Expand All @@ -57,7 +56,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
3 changes: 1 addition & 2 deletions generated-dockerfiles/rapidsai-core_ubuntu16.04-base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu16.04-devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -73,7 +72,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu16.04-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -59,7 +58,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
3 changes: 1 addition & 2 deletions generated-dockerfiles/rapidsai-core_ubuntu18.04-base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu18.04-devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -73,7 +72,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu18.04-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -59,7 +58,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
3 changes: 1 addition & 2 deletions generated-dockerfiles/rapidsai-core_ubuntu20.04-base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu20.04-devel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -73,7 +72,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
7 changes: 4 additions & 3 deletions generated-dockerfiles/rapidsai-core_ubuntu20.04-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ RUN gpuci_conda_retry install -y -n rapids \


RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
&& npm i -g npm@">=7.0 <7.11"

RUN apt-get update \
&& apt-get -y upgrade \
Expand All @@ -59,7 +58,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
ENV DASK_LABEXTENSION__FACTORY__CLASS="LocalCUDACluster"
Expand Down
4 changes: 3 additions & 1 deletion templates/rapidsai-core/partials/install_notebooks.dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ RUN gpuci_conda_retry install -y -n rapids \
RUN gpuci_conda_retry install -y -n rapids jupyterlab-nvdashboard

RUN source activate rapids \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager dask-labextension jupyterlab-nvdashboard \
&& jupyter lab clean \
&& jlpm cache clean

{# Configure Dask Jupyter Lab Extension to use dask_cuda by default #}
ENV DASK_LABEXTENSION__FACTORY__MODULE="dask_cuda"
Expand Down
3 changes: 1 addition & 2 deletions templates/rapidsai-core/partials/patch.dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

{# Patch for CVE-2020-8116 https://github.com/advisories/GHSA-ff7x-qrg7-qggm #}
RUN source activate rapids \
&& npm i -g npm@">=7" \
&& rm -rf /tmp/yarn* # Removes cached yarn directories from tmp that have outdated ssri/y18n packages
ajschmidt8 marked this conversation as resolved.
Show resolved Hide resolved
&& npm i -g npm@">=7.0 <7.11"

{% if "centos" in os %}
RUN yum -y upgrade \
Expand Down