Skip to content

Commit 4d7dd95

Browse files
authored
Merge pull request #867 from echowhisky/issue-861
Changed `conda clean` flags to `--all -f -y`
2 parents 2662627 + 167c686 commit 4d7dd95

File tree

12 files changed

+16
-16
lines changed

12 files changed

+16
-16
lines changed

all-spark-notebook/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN conda install --quiet --yes \
2828
'r-ggplot2=3.1*' \
2929
'r-sparklyr=0.9*' \
3030
'r-rcurl=1.95*' && \
31-
conda clean -tipsy && \
31+
conda clean --all -f -y && \
3232
fix-permissions $CONDA_DIR && \
3333
fix-permissions /home/$NB_USER
3434

@@ -43,7 +43,7 @@ RUN pip install --no-cache-dir \
4343

4444
# Spylon-kernel
4545
RUN conda install --quiet --yes 'spylon-kernel=0.4*' && \
46-
conda clean -tipsy && \
46+
conda clean --all -f -y && \
4747
python -m spylon_kernel install --sys-prefix && \
4848
rm -rf /home/$NB_USER/.local && \
4949
fix-permissions $CONDA_DIR && \

base-notebook/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ RUN cd /tmp && \
8080
$CONDA_DIR/bin/conda install --quiet --yes conda="${CONDA_VERSION%.*}.*" && \
8181
$CONDA_DIR/bin/conda update --all --quiet --yes && \
8282
conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \
83-
conda clean -tipsy && \
83+
conda clean --all -f -y && \
8484
rm -rf /home/$NB_USER/.cache/yarn && \
8585
fix-permissions $CONDA_DIR && \
8686
fix-permissions /home/$NB_USER
8787

8888
# Install Tini
8989
RUN conda install --quiet --yes 'tini=0.18.0' && \
9090
conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \
91-
conda clean -tipsy && \
91+
conda clean --all -f -y && \
9292
fix-permissions $CONDA_DIR && \
9393
fix-permissions /home/$NB_USER
9494

@@ -102,7 +102,7 @@ RUN conda install --quiet --yes \
102102
'notebook=5.7.8' \
103103
'jupyterhub=0.9.6' \
104104
'jupyterlab=0.35.5' && \
105-
conda clean -tipsy && \
105+
conda clean --all -f -y && \
106106
jupyter labextension install @jupyterlab/hub-extension@^0.12.0 && \
107107
npm cache clean --force && \
108108
jupyter notebook --generate-config && \

base-notebook/Dockerfile.ppc64le

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ RUN cd /tmp && \
7171
$CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \
7272
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \
7373
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
74-
conda clean -tipsy
74+
conda clean --all -f -y
7575

7676
# Install Jupyter notebook and Hub
7777
RUN yes | pip install --upgrade pip

base-notebook/Dockerfile.ppc64le.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
+ $CONDA_DIR/bin/conda install --quiet --yes conda=4.2.12 && \
7878
$CONDA_DIR/bin/conda config --system --add channels conda-forge && \
7979
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
80-
conda clean -tipsy
80+
conda clean --all -f -y
8181

8282
-# Install Jupyter Notebook and Hub
8383
-RUN conda install --quiet --yes \
8484
- 'notebook=5.2.*' \
8585
- 'jupyterhub=0.7.*' \
8686
- 'jupyterlab=0.18.*' \
87-
- && conda clean -tipsy
87+
- && conda clean --all -f -y
8888
+# Install Jupyter notebook and Hub
8989
+RUN yes | pip install --upgrade pip
9090
+RUN yes | pip install --quiet --no-cache-dir \

datascience-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ RUN conda install --quiet --yes \
6565
'r-sparklyr=0.9*' \
6666
'r-htmlwidgets=1.2*' \
6767
'r-hexbin=1.27*' && \
68-
conda clean -tipsy && \
68+
conda clean --all -f -y && \
6969
fix-permissions $CONDA_DIR && \
7070
fix-permissions /home/$NB_USER
7171

docs/using/recipes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ FROM jupyter/scipy-notebook:latest
5858
# and the kernda utility. Add any additional packages you want available for use
5959
# in a Python 2 notebook to the first line here (e.g., pandas, matplotlib, etc.)
6060
RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 ipython ipykernel kernda && \
61-
conda clean -tipsy
61+
conda clean --all -f -y
6262
6363
USER root
6464

examples/source-to-image/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The next steps are:
8787
```
8888
if [ -f /home/$NB_USER/environment.yml ]; then
8989
conda env update --name root --file /home/$NB_USER/environment.yml
90-
conda clean -tipsy
90+
conda clean --all -f -y
9191
else
9292
if [ -f /home/$NB_USER/requirements.txt ]; then
9393
pip --no-cache-dir install -r /home/$NB_USER/requirements.txt

examples/source-to-image/assemble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rm -rf /tmp/src
2626

2727
if [ -f /home/$NB_USER/environment.yml ]; then
2828
conda env update --name root --file /home/$NB_USER/environment.yml
29-
conda clean -tipsy
29+
conda clean --all -f -y
3030
else
3131
if [ -f /home/$NB_USER/requirements.txt ]; then
3232
pip --no-cache-dir install -r /home/$NB_USER/requirements.txt

pyspark-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ USER $NB_UID
4545

4646
# Install pyarrow
4747
RUN conda install --quiet -y 'pyarrow' && \
48-
conda clean -tipsy && \
48+
conda clean --all -f -y && \
4949
fix-permissions $CONDA_DIR && \
5050
fix-permissions /home/$NB_USER

r-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ RUN conda install --quiet --yes \
4646
'r-sparklyr=0.9*' \
4747
'r-htmlwidgets=1.2*' \
4848
'r-hexbin=1.27*' && \
49-
conda clean -tipsy && \
49+
conda clean --all -f -y && \
5050
fix-permissions $CONDA_DIR

scipy-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN conda install --quiet --yes \
4444
'protobuf=3.7.*' \
4545
'xlrd' && \
4646
conda remove --quiet --yes --force qt pyqt && \
47-
conda clean -tipsy && \
47+
conda clean --all -f -y && \
4848
# Activate ipywidgets extension in the environment that runs the notebook server
4949
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
5050
# Also activate ipywidgets extension for JupyterLab

tensorflow-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ LABEL maintainer="Jupyter Project <[email protected]>"
99
RUN conda install --quiet --yes \
1010
'tensorflow=1.13*' \
1111
'keras=2.2*' && \
12-
conda clean -tipsy && \
12+
conda clean --all -f -y && \
1313
fix-permissions $CONDA_DIR && \
1414
fix-permissions /home/$NB_USER

0 commit comments

Comments
 (0)