From 8dbeaa5401c194d86431ec174991013d448d9968 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 9 Mar 2023 15:52:20 +0400 Subject: [PATCH] Remove --quiet flag when not needed (#1887) --- all-spark-notebook/Dockerfile | 2 +- base-notebook/Dockerfile | 2 +- datascience-notebook/Dockerfile | 2 +- docs/using/common.md | 8 +++--- docs/using/recipes.md | 28 ++++++++++----------- examples/docker-compose/notebook/Dockerfile | 2 +- examples/make-deploy/Dockerfile | 2 +- pyspark-notebook/Dockerfile | 2 +- r-notebook/Dockerfile | 2 +- scipy-notebook/Dockerfile | 2 +- tensorflow-notebook/Dockerfile | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index 69cf982b88..46509fac71 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update --yes && \ USER ${NB_UID} # R packages including IRKernel which gets installed globally. -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'r-base' \ 'r-ggplot2' \ 'r-irkernel' \ diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index f703bdc367..0a097c6c39 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -35,7 +35,7 @@ USER ${NB_UID} # Do all this in a single RUN command to avoid duplicating all of the # files across image layers when the permissions change WORKDIR /tmp -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'notebook' \ 'jupyterhub' \ 'jupyterlab' && \ diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 0cd32198d7..e56ebe713a 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -61,7 +61,7 @@ USER ${NB_UID} # R packages including IRKernel which gets installed globally. # r-e1071: dependency of the caret R package -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'r-base' \ 'r-caret' \ 'r-crayon' \ diff --git a/docs/using/common.md b/docs/using/common.md index facbbf15db..1161439e5b 100644 --- a/docs/using/common.md +++ b/docs/using/common.md @@ -245,16 +245,16 @@ You can use either `mamba`, `pip` or `conda` (`mamba` is recommended) to install ```bash # install a package into the default (python 3.x) environment and cleanup it after # the installation -mamba install --quiet --yes some-package && \ +mamba install --yes some-package && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" -pip install --quiet --no-cache-dir some-package && \ +pip install --no-cache-dir some-package && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" -conda install --quiet --yes some-package && \ +conda install --yes some-package && \ conda clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" @@ -274,7 +274,7 @@ mamba install --channel defaults humanize conda config --system --prepend channels defaults # install a package -mamba install --quiet --yes humanize && \ +mamba install --yes humanize && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" diff --git a/docs/using/recipes.md b/docs/using/recipes.md index 6eecf8954e..fa777ddaac 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -31,7 +31,7 @@ Create a new Dockerfile like the one shown below. # Start from a core stack version FROM jupyter/datascience-notebook:2023-02-28 # Install in the default python3 environment -RUN pip install --quiet --no-cache-dir 'flake8==3.9.2' && \ +RUN pip install --no-cache-dir 'flake8==3.9.2' && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" ``` @@ -51,7 +51,7 @@ Next, create a new Dockerfile like the one shown below. FROM jupyter/datascience-notebook:2023-02-28 # Install from the requirements.txt file COPY --chown=${NB_UID}:${NB_GID} requirements.txt /tmp/ -RUN pip install --quiet --no-cache-dir --requirement /tmp/requirements.txt && \ +RUN pip install --no-cache-dir --requirement /tmp/requirements.txt && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" ``` @@ -85,7 +85,7 @@ ARG conda_env=python37 ARG py_ver=3.7 # you can add additional libraries you want mamba to install by listing them below the first line and ending with "&& \" -RUN mamba create --quiet --yes -p "${CONDA_DIR}/envs/${conda_env}" python=${py_ver} ipython ipykernel && \ +RUN mamba create --yes -p "${CONDA_DIR}/envs/${conda_env}" python=${py_ver} ipython ipykernel && \ mamba clean --all -f -y # alternatively, you can comment out the lines above and uncomment those below @@ -102,7 +102,7 @@ RUN "${CONDA_DIR}/envs/${conda_env}/bin/python" -m ipykernel install --user --na fix-permissions "/home/${NB_USER}" # any additional pip installs can be added by uncommenting the following line -# RUN "${CONDA_DIR}/envs/${conda_env}/bin/pip" install --quiet --no-cache-dir +# RUN "${CONDA_DIR}/envs/${conda_env}/bin/pip" install --no-cache-dir # if you want this environment to be the default one, uncomment the following line: # RUN echo "conda activate ${conda_env}" >> "${HOME}/.bashrc" @@ -118,7 +118,7 @@ Create the Dockerfile as: FROM jupyter/scipy-notebook:latest # Install the Dask dashboard -RUN pip install --quiet --no-cache-dir dask-labextension && \ +RUN pip install --no-cache-dir dask-labextension && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" @@ -160,7 +160,7 @@ notebooks, with no conversion, adding javascript Reveal.js: ```bash # Add Live slideshows with RISE -RUN mamba install --quiet --yes -c damianavila82 rise && \ +RUN mamba install --yes -c damianavila82 rise && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" @@ -175,12 +175,12 @@ You need to install conda-forge's gcc for Python xgboost to work correctly. Otherwise, you'll get an exception about libgomp.so.1 missing GOMP_4.0. ```bash -mamba install --quiet --yes gcc && \ +mamba install --yes gcc && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" -pip install --quiet --no-cache-dir xgboost && \ +pip install --no-cache-dir xgboost && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" @@ -284,7 +284,7 @@ version in the Hub itself. ```dockerfile FROM jupyter/base-notebook:2023-02-28 -RUN pip install --quiet --no-cache-dir jupyterhub==1.4.1 && \ +RUN pip install --no-cache-dir jupyterhub==1.4.1 && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" ``` @@ -438,9 +438,9 @@ USER ${NB_UID} # - Dashboards # - PyDoop # - PyHive -RUN pip install --quiet --no-cache-dir jupyter_dashboards faker && \ +RUN pip install --no-cache-dir jupyter_dashboards faker && \ jupyter dashboards quick-setup --sys-prefix && \ - pip2 install --quiet --no-cache-dir pyhive pydoop thrift sasl thrift_sasl faker && \ + pip2 install --no-cache-dir pyhive pydoop thrift sasl thrift_sasl faker && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" @@ -496,7 +496,7 @@ FROM jupyter/minimal-notebook:latest USER ${NB_UID} -RUN pip install --quiet --no-cache-dir jupyter_contrib_nbextensions && \ +RUN pip install --no-cache-dir jupyter_contrib_nbextensions && \ jupyter contrib nbextension install --user && \ # can modify or enable additional extensions here jupyter nbextension enable spellchecker/main --user && \ @@ -515,7 +515,7 @@ By adding the properties to `spark-defaults.conf`, the user no longer needs to e FROM jupyter/pyspark-notebook:latest ARG DELTA_CORE_VERSION="1.2.1" -RUN pip install --quiet --no-cache-dir delta-spark==${DELTA_CORE_VERSION} && \ +RUN pip install --no-cache-dir delta-spark==${DELTA_CORE_VERSION} && \ fix-permissions "${HOME}" && \ fix-permissions "${CONDA_DIR}" @@ -608,7 +608,7 @@ RUN apt-get update --yes && \ # Switch back to jovyan to avoid accidental container runs as root USER ${NB_UID} -RUN pip install --quiet --no-cache-dir pyodbc +RUN pip install --no-cache-dir pyodbc ``` You can now use `pyodbc` and `sqlalchemy` to interact with the database. diff --git a/examples/docker-compose/notebook/Dockerfile b/examples/docker-compose/notebook/Dockerfile index 49563b5503..4a7df7a284 100644 --- a/examples/docker-compose/notebook/Dockerfile +++ b/examples/docker-compose/notebook/Dockerfile @@ -13,4 +13,4 @@ USER ${NB_UID} # Switch back to jovyan to avoid accidental container runs as root # Add permanent mamba/pip/conda installs, data files, other user libs here -# e.g., RUN pip install --quiet --no-cache-dir flake8 +# e.g., RUN pip install --no-cache-dir flake8 diff --git a/examples/make-deploy/Dockerfile b/examples/make-deploy/Dockerfile index 49563b5503..4a7df7a284 100644 --- a/examples/make-deploy/Dockerfile +++ b/examples/make-deploy/Dockerfile @@ -13,4 +13,4 @@ USER ${NB_UID} # Switch back to jovyan to avoid accidental container runs as root # Add permanent mamba/pip/conda installs, data files, other user libs here -# e.g., RUN pip install --quiet --no-cache-dir flake8 +# e.g., RUN pip install --no-cache-dir flake8 diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 830c42b2d1..3ea011d9de 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -65,7 +65,7 @@ RUN fix-permissions "/etc/ipython/" USER ${NB_UID} # Install pyarrow -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'pyarrow' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 5f939f3d6e..579aa8f706 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -27,7 +27,7 @@ USER ${NB_UID} # R packages including IRKernel which gets installed globally. # r-e1071: dependency of the caret R package -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'r-base' \ 'r-caret' \ 'r-crayon' \ diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 50da610997..b06a0ee887 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update --yes && \ USER ${NB_UID} # Install Python 3 packages -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'altair' \ 'beautifulsoup4' \ 'bokeh' \ diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index 78a8af280c..25492de4f6 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -11,7 +11,7 @@ LABEL maintainer="Jupyter Project " SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install Tensorflow -RUN mamba install --quiet --yes \ +RUN mamba install --yes \ 'tensorflow' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \