mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-10 19:42:58 +00:00
changed -tipsy
to --all -y
across all files
The last commit was only for the base-notebook's Dockerfile. For this, all the files in the repo were grepped through and changed.
This commit is contained in:
@@ -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 -tipsy && \
|
conda clean --all -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 -tipsy && \
|
conda clean --all -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 && \
|
||||||
|
@@ -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 -tipsy
|
conda clean --all -y
|
||||||
|
|
||||||
# Install Jupyter notebook and Hub
|
# Install Jupyter notebook and Hub
|
||||||
RUN yes | pip install --upgrade pip
|
RUN yes | pip install --upgrade pip
|
||||||
|
@@ -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 -tipsy
|
conda clean --all -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 -tipsy
|
- && conda clean --all -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 \
|
||||||
|
@@ -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 -tipsy && \
|
conda clean --all -y && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
|
||||||
|
@@ -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 -tipsy
|
conda clean --all -y
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
|
@@ -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 -tipsy
|
conda clean --all -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
|
||||||
|
@@ -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 -tipsy
|
conda clean --all -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
|
||||||
|
@@ -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 -tipsy && \
|
conda clean --all -y && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
@@ -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 -tipsy && \
|
conda clean --all -y && \
|
||||||
fix-permissions $CONDA_DIR
|
fix-permissions $CONDA_DIR
|
||||||
|
@@ -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 -tipsy && \
|
conda clean --all -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
|
||||||
|
@@ -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 -tipsy && \
|
conda clean --all -y && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
Reference in New Issue
Block a user