Commit 45bfe5a4 authored by Romain's avatar Romain Committed by GitHub

Merge pull request #1181 from romainx/update_2020-11-20

Update docker stacks 2020-11-20
parents 1e2831c7 f055648e
...@@ -17,17 +17,17 @@ RUN apt-get update && \ ...@@ -17,17 +17,17 @@ RUN apt-get update && \
fonts-dejavu \ fonts-dejavu \
gfortran \ gfortran \
gcc && \ gcc && \
rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
USER $NB_UID USER $NB_UID
# R packages # R packages
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'r-base=3.6.3' \ 'r-base=4.0.3' \
'r-ggplot2=3.3*' \ 'r-ggplot2=3.3*' \
'r-irkernel=1.1*' \ 'r-irkernel=1.1*' \
'r-rcurl=1.98*' \ 'r-rcurl=1.98*' \
'r-sparklyr=1.2*' \ 'r-sparklyr=1.4*' \
&& \ && \
conda clean --all -f -y && \ conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Ubuntu 20.04 (focal) # Ubuntu 20.04 (focal)
# https://hub.docker.com/_/ubuntu/?tab=tags&name=focal # https://hub.docker.com/_/ubuntu/?tab=tags&name=focal
# OS/ARCH: linux/amd64 # OS/ARCH: linux/amd64
ARG ROOT_CONTAINER=ubuntu:focal-20200916@sha256:028d7303257c7f36c721b40099bf5004a41f666a54c0896d5f229f1c0fd99993 ARG ROOT_CONTAINER=ubuntu:focal-20200925@sha256:2e70e9c81838224b5311970dbf7ed16802fbfe19e7a70b3cbfa3d7522aa285b4
ARG BASE_CONTAINER=$ROOT_CONTAINER ARG BASE_CONTAINER=$ROOT_CONTAINER
FROM $BASE_CONTAINER FROM $BASE_CONTAINER
...@@ -28,7 +28,7 @@ ARG miniconda_version="4.8.3" ...@@ -28,7 +28,7 @@ ARG miniconda_version="4.8.3"
# Archive MD5 checksum # Archive MD5 checksum
ARG miniconda_checksum="d63adf39f2c220950a063e0529d4ff74" ARG miniconda_checksum="d63adf39f2c220950a063e0529d4ff74"
# Conda version that can be different from the archive # Conda version that can be different from the archive
ARG conda_version="4.8.5" ARG conda_version="4.9.0"
# Install all OS dependencies for notebook server that starts but lacks all # Install all OS dependencies for notebook server that starts but lacks all
# features (e.g., download as all possible file formats) # features (e.g., download as all possible file formats)
......
...@@ -18,9 +18,9 @@ USER root ...@@ -18,9 +18,9 @@ USER root
# Default values can be overridden at build time # Default values can be overridden at build time
# (ARGS are in lower case to distinguish them from ENV) # (ARGS are in lower case to distinguish them from ENV)
# Check https://julialang.org/downloads/ # Check https://julialang.org/downloads/
ARG julia_version="1.5.1" ARG julia_version="1.5.2"
# SHA256 checksum # SHA256 checksum
ARG julia_checksum="f5d37cb7fe40e3a730f721da8f7be40310f133220220949939d8f892ce2e86e3" ARG julia_checksum="6da704fadcefa39725503e4c7a9cfa1a570ba8a647c4bd8de69a118f43584630"
# R pre-requisites # R pre-requisites
RUN apt-get update && \ RUN apt-get update && \
...@@ -28,7 +28,7 @@ RUN apt-get update && \ ...@@ -28,7 +28,7 @@ RUN apt-get update && \
fonts-dejavu \ fonts-dejavu \
gfortran \ gfortran \
gcc && \ gcc && \
rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
# Julia dependencies # Julia dependencies
# install Julia packages in /opt/julia instead of $HOME # install Julia packages in /opt/julia instead of $HOME
...@@ -58,26 +58,23 @@ USER $NB_UID ...@@ -58,26 +58,23 @@ USER $NB_UID
# R packages including IRKernel which gets installed globally. # R packages including IRKernel which gets installed globally.
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'r-base=3.6.3' \ 'r-base=4.0.3' \
'r-caret=6.0*' \ 'r-caret=6.0*' \
'r-crayon=1.3*' \ 'r-crayon=1.3*' \
'r-devtools=2.3*' \ 'r-devtools=2.3*' \
'r-forecast=8.13*' \ 'r-forecast=8.13*' \
'r-hexbin=1.28*' \ 'r-hexbin=1.28*' \
'r-htmltools=0.5*' \ 'r-htmltools=0.5*' \
'r-htmlwidgets=1.5*' \ 'r-htmlwidgets=1.5*' \
'r-irkernel=1.1*' \ 'r-irkernel=1.1*' \
'r-nycflights13=1.0*' \ 'r-nycflights13=1.0*' \
'r-plyr=1.8*' \
'r-randomforest=4.6*' \ 'r-randomforest=4.6*' \
'r-rcurl=1.98*' \ 'r-rcurl=1.98*' \
'r-reshape2=1.4*' \ 'r-rmarkdown=2.4*' \
'r-rmarkdown=2.3*' \
'r-rsqlite=2.2*' \ 'r-rsqlite=2.2*' \
'r-shiny=1.5*' \ 'r-shiny=1.5*' \
'r-tidyverse=1.3*' \ 'r-tidyverse=1.3*' \
'rpy2=3.3*' \ 'rpy2=3.3*' && \
&& \
conda clean --all -f -y && \ conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" fix-permissions "/home/${NB_USER}"
......
...@@ -63,12 +63,7 @@ and versioning strategy. ...@@ -63,12 +63,7 @@ and versioning strategy.
- Everything in `jupyter/minimal-notebook` and its ancestor images - Everything in `jupyter/minimal-notebook` and its ancestor images
- The [R](https://www.r-project.org/) interpreter and base environment - The [R](https://www.r-project.org/) interpreter and base environment
- [IRKernel](https://irkernel.github.io/) to support R code in Jupyter notebooks - [IRKernel](https://irkernel.github.io/) to support R code in Jupyter notebooks
- [tidyverse](https://www.tidyverse.org/) packages, including [ggplot2](http://ggplot2.org/), - [tidyverse](https://www.tidyverse.org/) packages from
[dplyr](http://dplyr.tidyverse.org/), [tidyr](http://tidyr.tidyverse.org/),
[readr](http://readr.tidyverse.org/), [purrr](http://purrr.tidyverse.org/),
[tibble](http://tibble.tidyverse.org/), [stringr](http://stringr.tidyverse.org/),
[lubridate](http://lubridate.tidyverse.org/), and
[broom](https://cran.r-project.org/web/packages/broom/vignettes/broom.html) from
[conda-forge](https://conda-forge.github.io/feedstocks) [conda-forge](https://conda-forge.github.io/feedstocks)
- [devtools](https://cran.r-project.org/web/packages/devtools/index.html), - [devtools](https://cran.r-project.org/web/packages/devtools/index.html),
[shiny](https://shiny.rstudio.com/), [rmarkdown](http://rmarkdown.rstudio.com/), [shiny](https://shiny.rstudio.com/), [rmarkdown](http://rmarkdown.rstudio.com/),
......
...@@ -26,7 +26,7 @@ RUN apt-get -y update && \ ...@@ -26,7 +26,7 @@ RUN apt-get -y update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
"openjdk-${openjdk_version}-jre-headless" \ "openjdk-${openjdk_version}-jre-headless" \
ca-certificates-java && \ ca-certificates-java && \
rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
# Spark installation # Spark installation
WORKDIR /tmp WORKDIR /tmp
......
...@@ -16,7 +16,7 @@ RUN apt-get update && \ ...@@ -16,7 +16,7 @@ RUN apt-get update && \
r-cran-rodbc \ r-cran-rodbc \
gfortran \ gfortran \
gcc && \ gcc && \
rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
# Fix for devtools https://github.com/conda-forge/r-devtools-feedstock/issues/4 # Fix for devtools https://github.com/conda-forge/r-devtools-feedstock/issues/4
RUN ln -s /bin/tar /bin/gtar RUN ln -s /bin/tar /bin/gtar
...@@ -25,7 +25,7 @@ USER $NB_UID ...@@ -25,7 +25,7 @@ USER $NB_UID
# R packages # R packages
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'r-base=4.0.2' \ 'r-base=4.0.3' \
'r-caret=6.*' \ 'r-caret=6.*' \
'r-crayon=1.3*' \ 'r-crayon=1.3*' \
'r-devtools=2.3*' \ 'r-devtools=2.3*' \
...@@ -37,7 +37,7 @@ RUN conda install --quiet --yes \ ...@@ -37,7 +37,7 @@ RUN conda install --quiet --yes \
'r-nycflights13=1.0*' \ 'r-nycflights13=1.0*' \
'r-randomforest=4.6*' \ 'r-randomforest=4.6*' \
'r-rcurl=1.98*' \ 'r-rcurl=1.98*' \
'r-rmarkdown=2.3*' \ 'r-rmarkdown=2.4*' \
'r-rodbc=1.3*' \ 'r-rodbc=1.3*' \
'r-rsqlite=2.2*' \ 'r-rsqlite=2.2*' \
'r-shiny=1.5*' \ 'r-shiny=1.5*' \
......
...@@ -10,7 +10,7 @@ USER root ...@@ -10,7 +10,7 @@ USER root
# ffmpeg for matplotlib anim & dvipng+cm-super for latex labels # ffmpeg for matplotlib anim & dvipng+cm-super for latex labels
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends ffmpeg dvipng cm-super && \ apt-get install -y --no-install-recommends ffmpeg dvipng cm-super && \
rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
USER $NB_UID USER $NB_UID
...@@ -22,7 +22,7 @@ RUN conda install --quiet --yes \ ...@@ -22,7 +22,7 @@ RUN conda install --quiet --yes \
'bottleneck=1.3.*' \ 'bottleneck=1.3.*' \
'cloudpickle=1.6.*' \ 'cloudpickle=1.6.*' \
'cython=0.29.*' \ 'cython=0.29.*' \
'dask=2.25.*' \ 'dask=2.30.*' \
'dill=0.3.*' \ 'dill=0.3.*' \
'h5py=2.10.*' \ 'h5py=2.10.*' \
'ipywidgets=7.5.*' \ 'ipywidgets=7.5.*' \
...@@ -32,7 +32,7 @@ RUN conda install --quiet --yes \ ...@@ -32,7 +32,7 @@ RUN conda install --quiet --yes \
'numexpr=2.7.*' \ 'numexpr=2.7.*' \
'pandas=1.1.*' \ 'pandas=1.1.*' \
'patsy=0.5.*' \ 'patsy=0.5.*' \
'protobuf=3.12.*' \ 'protobuf=3.13.*' \
'pytables=3.6.*' \ 'pytables=3.6.*' \
'scikit-image=0.17.*' \ 'scikit-image=0.17.*' \
'scikit-learn=0.23.*' \ 'scikit-learn=0.23.*' \
......
...@@ -7,6 +7,6 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>" ...@@ -7,6 +7,6 @@ LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
# Install Tensorflow # Install Tensorflow
RUN pip install --quiet --no-cache-dir \ RUN pip install --quiet --no-cache-dir \
'tensorflow==2.3.0' && \ 'tensorflow==2.3.1' && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" fix-permissions "/home/${NB_USER}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment