hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-13 21:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

added -f flag to all conda clean commands

Browse Source 
This commit adds the additional `-f` force command to all uses of `conda
clean --all` through the repo. Size should be smaller, but still testing
if anything breaks. See issue #861.
This commit is contained in:
echowhisky
2019-05-04 19:11:32 +00:00
parent 1f8311a7aa
commit 40c5c07b0a
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
all-spark-notebook/Dockerfile
View File

@@ -28,7 +28,7 @@ RUN conda install --quiet --yes \
'r-ggplot2=3.1*' \ 'r-ggplot2=3.1*' \
'r-sparklyr=0.9*' \ 'r-sparklyr=0.9*' \
'r-rcurl=1.95*' && \ 'r-rcurl=1.95*' && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
@@ -43,7 +43,7 @@ RUN pip install --no-cache-dir \
# Spylon-kernel # Spylon-kernel
RUN conda install --quiet --yes 'spylon-kernel=0.4*' && \ RUN conda install --quiet --yes 'spylon-kernel=0.4*' && \
conda clean --all -y && \ conda clean --all -f -y && \
python -m spylon_kernel install --sys-prefix && \ python -m spylon_kernel install --sys-prefix && \
rm -rf /home/$NB_USER/.local && \ rm -rf /home/$NB_USER/.local && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \

6
base-notebook/Dockerfile
View File

@@ -79,7 +79,7 @@ RUN cd /tmp && \
$CONDA_DIR/bin/conda config --system --set show_channel_urls true && \ $CONDA_DIR/bin/conda config --system --set show_channel_urls true && \
$CONDA_DIR/bin/conda install --quiet --yes conda="${CONDA_VERSION%.*}.*" && \ $CONDA_DIR/bin/conda install --quiet --yes conda="${CONDA_VERSION%.*}.*" && \
$CONDA_DIR/bin/conda update --all --quiet --yes && \ $CONDA_DIR/bin/conda update --all --quiet --yes && \
conda clean --all -y && \ conda clean --all -f -y && \
rm -rf /home/$NB_USER/.cache/yarn && \ rm -rf /home/$NB_USER/.cache/yarn && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
@@ -87,7 +87,7 @@ RUN cd /tmp && \
# Install Tini # Install Tini
RUN conda install --quiet --yes 'tini=0.18.0' && \ RUN conda install --quiet --yes 'tini=0.18.0' && \
conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \ conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER
@@ -101,7 +101,7 @@ RUN conda install --quiet --yes \
'notebook=5.7.8' \ 'notebook=5.7.8' \
'jupyterhub=0.9.6' \ 'jupyterhub=0.9.6' \
'jupyterlab=0.35.4' && \ 'jupyterlab=0.35.4' && \
conda clean --all -y && \ conda clean --all -f -y && \
jupyter labextension install @jupyterlab/hub-extension@^0.12.0 && \ jupyter labextension install @jupyterlab/hub-extension@^0.12.0 && \
npm cache clean --force && \ npm cache clean --force && \
jupyter notebook --generate-config && \ jupyter notebook --generate-config && \

2
base-notebook/Dockerfile.ppc64le
View File

@@ -71,7 +71,7 @@ RUN cd /tmp && \
$CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \ $CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
conda clean --all -y conda clean --all -f -y
# Install Jupyter notebook and Hub # Install Jupyter notebook and Hub
RUN yes | pip install --upgrade pip RUN yes | pip install --upgrade pip

4
base-notebook/Dockerfile.ppc64le.patch
View File

@@ -77,14 +77,14 @@
+ $CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \ + $CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
conda clean --all -y conda clean --all -f -y
-# Install Jupyter Notebook and Hub -# Install Jupyter Notebook and Hub
-RUN conda install --quiet --yes \ -RUN conda install --quiet --yes \
- 'notebook=5.2.*' \ - 'notebook=5.2.*' \
- 'jupyterhub=0.7.*' \ - 'jupyterhub=0.7.*' \
- 'jupyterlab=0.18.*' \ - 'jupyterlab=0.18.*' \
- && conda clean --all -y - && conda clean --all -f -y
+# Install Jupyter notebook and Hub +# Install Jupyter notebook and Hub
+RUN yes | pip install --upgrade pip +RUN yes | pip install --upgrade pip
+RUN yes | pip install --quiet --no-cache-dir \ +RUN yes | pip install --quiet --no-cache-dir \

2
datascience-notebook/Dockerfile
View File

@@ -65,7 +65,7 @@ RUN conda install --quiet --yes \
'r-sparklyr=0.9*' \ 'r-sparklyr=0.9*' \
'r-htmlwidgets=1.2*' \ 'r-htmlwidgets=1.2*' \
'r-hexbin=1.27*' && \ 'r-hexbin=1.27*' && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER

2
docs/using/recipes.md
View File

@@ -58,7 +58,7 @@ FROM jupyter/scipy-notebook:latest
# and the kernda utility. Add any additional packages you want available for use # and the kernda utility. Add any additional packages you want available for use
# in a Python 2 notebook to the first line here (e.g., pandas, matplotlib, etc.) # in a Python 2 notebook to the first line here (e.g., pandas, matplotlib, etc.)
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 ipython ipykernel kernda && \ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 ipython ipykernel kernda && \
conda clean --all -y conda clean --all -f -y
USER root USER root

2
examples/source-to-image/README.md
View File

@@ -87,7 +87,7 @@ The next steps are:
``` ```
if [ -f /home/$NB_USER/environment.yml ]; then if [ -f /home/$NB_USER/environment.yml ]; then
conda env update --name root --file /home/$NB_USER/environment.yml conda env update --name root --file /home/$NB_USER/environment.yml
conda clean --all -y conda clean --all -f -y
else else
if [ -f /home/$NB_USER/requirements.txt ]; then if [ -f /home/$NB_USER/requirements.txt ]; then
pip --no-cache-dir install -r /home/$NB_USER/requirements.txt pip --no-cache-dir install -r /home/$NB_USER/requirements.txt

2
examples/source-to-image/assemble
View File

@@ -26,7 +26,7 @@ rm -rf /tmp/src
if [ -f /home/$NB_USER/environment.yml ]; then if [ -f /home/$NB_USER/environment.yml ]; then
conda env update --name root --file /home/$NB_USER/environment.yml conda env update --name root --file /home/$NB_USER/environment.yml
conda clean --all -y conda clean --all -f -y
else else
if [ -f /home/$NB_USER/requirements.txt ]; then if [ -f /home/$NB_USER/requirements.txt ]; then
pip --no-cache-dir install -r /home/$NB_USER/requirements.txt pip --no-cache-dir install -r /home/$NB_USER/requirements.txt

2
pyspark-notebook/Dockerfile
View File

@@ -45,6 +45,6 @@ USER $NB_UID
# Install pyarrow # Install pyarrow
RUN conda install --quiet -y 'pyarrow' && \ RUN conda install --quiet -y 'pyarrow' && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER

2
r-notebook/Dockerfile
View File

@@ -46,5 +46,5 @@ RUN conda install --quiet --yes \
'r-sparklyr=0.9*' \ 'r-sparklyr=0.9*' \
'r-htmlwidgets=1.2*' \ 'r-htmlwidgets=1.2*' \
'r-hexbin=1.27*' && \ 'r-hexbin=1.27*' && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR fix-permissions $CONDA_DIR

2
scipy-notebook/Dockerfile
View File

@@ -44,7 +44,7 @@ RUN conda install --quiet --yes \
'protobuf=3.7.*' \ 'protobuf=3.7.*' \
'xlrd' && \ 'xlrd' && \
conda remove --quiet --yes --force qt pyqt && \ conda remove --quiet --yes --force qt pyqt && \
conda clean --all -y && \ conda clean --all -f -y && \
# Activate ipywidgets extension in the environment that runs the notebook server # Activate ipywidgets extension in the environment that runs the notebook server
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \ jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
# Also activate ipywidgets extension for JupyterLab # Also activate ipywidgets extension for JupyterLab

2
tensorflow-notebook/Dockerfile
View File

@@ -9,6 +9,6 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'tensorflow=1.12*' \ 'tensorflow=1.12*' \
'keras=2.2*' && \ 'keras=2.2*' && \
conda clean --all -y && \ conda clean --all -f -y && \
fix-permissions $CONDA_DIR && \ fix-permissions $CONDA_DIR && \
fix-permissions /home/$NB_USER fix-permissions /home/$NB_USER