Skip to content

Commit 2ce7c06

Browse files
authored
Merge pull request #920 from rkdarst/sort-installs
Sort package installation lines alphabetically for easier comparison
2 parents 66c9962 + 8bfffca commit 2ce7c06

File tree

4 files changed

+53
-49
lines changed

4 files changed

+53
-49
lines changed

all-spark-notebook/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ USER $NB_UID
2424
# R packages
2525
RUN conda install --quiet --yes \
2626
'r-base=3.6.1' \
27-
'r-irkernel=1.0*' \
2827
'r-ggplot2=3.2*' \
28+
'r-irkernel=1.0*' \
29+
'r-rcurl=1.95*' \
2930
'r-sparklyr=1.0*' \
30-
'r-rcurl=1.95*' && \
31+
&& \
3132
conda clean --all -f -y && \
3233
fix-permissions $CONDA_DIR && \
3334
fix-permissions /home/$NB_USER

datascience-notebook/Dockerfile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,27 @@ USER $NB_UID
4545

4646
# R packages including IRKernel which gets installed globally.
4747
RUN conda install --quiet --yes \
48-
'rpy2=2.9*' \
4948
'r-base=3.6.1' \
50-
'r-irkernel=1.0*' \
51-
'r-plyr=1.8*' \
49+
'r-caret=6.0*' \
50+
'r-crayon=1.3*' \
5251
'r-devtools=2.1*' \
53-
'r-tidyverse=1.2*' \
54-
'r-shiny=1.3*' \
55-
'r-rmarkdown=1.14*' \
5652
'r-forecast=8.7*' \
57-
'r-rsqlite=2.1*' \
58-
'r-reshape2=1.4*' \
53+
'r-hexbin=1.27*' \
54+
'r-htmltools=0.3*' \
55+
'r-htmlwidgets=1.3*' \
56+
'r-irkernel=1.0*' \
5957
'r-nycflights13=1.0*' \
60-
'r-caret=6.0*' \
61-
'r-rcurl=1.95*' \
62-
'r-crayon=1.3*' \
58+
'r-plyr=1.8*' \
6359
'r-randomforest=4.6*' \
64-
'r-htmltools=0.3*' \
60+
'r-rcurl=1.95*' \
61+
'r-reshape2=1.4*' \
62+
'r-rmarkdown=1.14*' \
63+
'r-rsqlite=2.1*' \
64+
'r-shiny=1.3*' \
6565
'r-sparklyr=1.0*' \
66-
'r-htmlwidgets=1.3*' \
67-
'r-hexbin=1.27*' && \
66+
'r-tidyverse=1.2*' \
67+
'rpy2=2.9*' \
68+
&& \
6869
conda clean --all -f -y && \
6970
fix-permissions $CONDA_DIR && \
7071
fix-permissions /home/$NB_USER

r-notebook/Dockerfile

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,27 @@ USER $NB_UID
2626
# R packages
2727
RUN conda install --quiet --yes \
2828
'r-base=3.6.1' \
29-
'r-rodbc=1.3*' \
30-
'unixodbc=2.3.*' \
31-
'r-irkernel=1.0*' \
32-
'r-plyr=1.8*' \
29+
'r-caret=6.0*' \
30+
'r-crayon=1.3*' \
3331
'r-devtools=2.0*' \
34-
'r-tidyverse=1.2*' \
35-
'r-shiny=1.3*' \
36-
'r-rmarkdown=1.14*' \
3732
'r-forecast=8.7*' \
38-
'r-rsqlite=2.1*' \
39-
'r-reshape2=1.4*' \
33+
'r-hexbin=1.27*' \
34+
'r-htmltools=0.3*' \
35+
'r-htmlwidgets=1.3*' \
36+
'r-irkernel=1.0*' \
4037
'r-nycflights13=1.0*' \
41-
'r-caret=6.0*' \
42-
'r-rcurl=1.95*' \
43-
'r-crayon=1.3*' \
38+
'r-plyr=1.8*' \
4439
'r-randomforest=4.6*' \
45-
'r-htmltools=0.3*' \
40+
'r-rcurl=1.95*' \
41+
'r-reshape2=1.4*' \
42+
'r-rmarkdown=1.14*' \
43+
'r-rodbc=1.3*' \
44+
'r-rsqlite=2.1*' \
45+
'r-shiny=1.3*' \
4646
'r-sparklyr=1.0*' \
47-
'r-htmlwidgets=1.3*' \
48-
'r-hexbin=1.27*' && \
47+
'r-tidyverse=1.2*' \
48+
'unixodbc=2.3.*' \
49+
&& \
4950
conda clean --all -f -y && \
5051
fix-permissions $CONDA_DIR
5152

scipy-notebook/Dockerfile

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,32 @@ USER $NB_UID
1616

1717
# Install Python 3 packages
1818
RUN conda install --quiet --yes \
19+
'beautifulsoup4=4.8.*' \
1920
'conda-forge::blas=*=openblas' \
21+
'bokeh=1.3*' \
22+
'cloudpickle=1.2*' \
23+
'cython=0.29*' \
24+
'dask=2.2.*' \
25+
'dill=0.3*' \
26+
'h5py=2.9*' \
27+
'hdf5=1.10*' \
2028
'ipywidgets=7.5*' \
21-
'pandas=0.25*' \
22-
'numexpr=2.6*' \
2329
'matplotlib-base=3.1.*' \
30+
'numba=0.45*' \
31+
'numexpr=2.6*' \
32+
'pandas=0.25*' \
33+
'patsy=0.5*' \
34+
'protobuf=3.9.*' \
35+
'scikit-image=0.15*' \
36+
'scikit-learn=0.21*' \
2437
'scipy=1.3*' \
2538
'seaborn=0.9*' \
26-
'scikit-learn=0.21*' \
27-
'scikit-image=0.15*' \
28-
'sympy=1.4*' \
29-
'cython=0.29*' \
30-
'patsy=0.5*' \
31-
'statsmodels=0.10*' \
32-
'cloudpickle=1.2*' \
33-
'dill=0.3*' \
34-
'dask=2.2.*' \
35-
'numba=0.45*' \
36-
'bokeh=1.3*' \
3739
'sqlalchemy=1.3*' \
38-
'hdf5=1.10*' \
39-
'h5py=2.9*' \
40+
'statsmodels=0.10*' \
41+
'sympy=1.4*' \
4042
'vincent=0.4.*' \
41-
'beautifulsoup4=4.8.*' \
42-
'protobuf=3.9.*' \
43-
'xlrd' && \
43+
'xlrd' \
44+
&& \
4445
conda clean --all -f -y && \
4546
# Activate ipywidgets extension in the environment that runs the notebook server
4647
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \

0 commit comments

Comments
 (0)