diff --git a/Makefile b/Makefile index 02b3010ab1..d3dc3c36d3 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ ALL_IMAGES:=$(ALL_STACKS) # Dockerfile Linter HADOLINT="${HOME}/hadolint" -HADOLINT_VERSION="v1.23.0" +HADOLINT_VERSION="v2.1.0" # Enable BuildKit for Docker build export DOCKER_BUILDKIT:=1 diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 211d379b3d..f5fcd138b2 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -4,7 +4,7 @@ # Ubuntu 20.04 (focal) # https://hub.docker.com/_/ubuntu/?tab=tags&name=focal # OS/ARCH: linux/amd64 -ARG ROOT_CONTAINER=ubuntu:focal-20210217@sha256:e3d7ff9efd8431d9ef39a144c45992df5502c995b9ba3c53ff70c5b52a848d9c +ARG ROOT_CONTAINER=ubuntu:focal-20210401@sha256:5403064f94b617f7975a19ba4d1a1299fd584397f6ee4393d0e16744ed11aab1 ARG BASE_CONTAINER=$ROOT_CONTAINER FROM $BASE_CONTAINER @@ -24,9 +24,9 @@ USER root # (ARGS are in lower case to distinguish them from ENV) # Check https://github.com/conda-forge/miniforge/releases # Conda version -ARG conda_version="4.9.2" +ARG conda_version="4.10.0" # Miniforge installer patch version -ARG miniforge_patch_number="7" +ARG miniforge_patch_number="0" # Miniforge installer architecture ARG miniforge_arch="x86_64" # Package Manager and Python implementation to use (https://github.com/conda-forge/miniforge) @@ -39,7 +39,7 @@ ARG miniforge_version="${conda_version}-${miniforge_patch_number}" # Miniforge installer ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh" # Miniforge checksum -ARG miniforge_checksum="5a827a62d98ba2217796a9dc7673380257ed7c161017565fba8ce785fb21a599" +ARG miniforge_checksum="c56cc2da96043688c6bdb521d825de27754de0a342d5228ba3155cd94532ff75" # Install all OS dependencies for notebook server that starts but lacks all # features (e.g., download as all possible file formats) @@ -132,7 +132,7 @@ RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${m # Do all this in a single RUN command to avoid duplicating all of the # files across image layers when the permissions change RUN conda install --quiet --yes \ - 'notebook=6.2.0' \ + 'notebook=6.3.0' \ 'jupyterhub=1.3.0' \ 'jupyterlab=3.0.12' && \ conda clean --all -f -y && \ diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 3daa993de9..24a0133c7d 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -18,9 +18,9 @@ USER root # Default values can be overridden at build time # (ARGS are in lower case to distinguish them from ENV) # Check https://julialang.org/downloads/ -ARG julia_version="1.5.4" +ARG julia_version="1.6.0" # SHA256 checksum -ARG julia_checksum="80dec351d1a593e8ad152636971a48d0c81bfcfab92c87f3604663616f1e8bc5" +ARG julia_checksum="463b71dc70ca7094c0e0fd6d55d130051a7901e8dec5eb44d6002c57d1bd8585" # R pre-requisites RUN apt-get update && \ @@ -61,7 +61,7 @@ RUN conda install --quiet --yes \ 'r-base=4.0.3' \ 'r-caret=6.0*' \ 'r-crayon=1.4*' \ - 'r-devtools=2.3*' \ + 'r-devtools=2.4*' \ 'r-forecast=8.14*' \ 'r-hexbin=1.28*' \ 'r-htmltools=0.5*' \ diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 4193fbd622..5b5e7b592a 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -28,7 +28,7 @@ RUN conda install --quiet --yes \ 'r-base=4.0.3' \ 'r-caret=6.*' \ 'r-crayon=1.4*' \ - 'r-devtools=2.3*' \ + 'r-devtools=2.4*' \ 'r-forecast=8.14*' \ 'r-hexbin=1.28*' \ 'r-htmltools=0.5*' \ diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 64b0e8d67a..dd91267066 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -22,12 +22,12 @@ RUN conda install --quiet --yes \ 'bottleneck=1.3.*' \ 'cloudpickle=1.6.*' \ 'cython=0.29.*' \ - 'dask=2021.3.*' \ + 'dask=2021.4.*' \ 'dill=0.3.*' \ 'h5py=3.1.*' \ 'ipywidgets=7.6.*' \ - 'ipympl=0.6.*'\ - 'matplotlib-base=3.3.*' \ + 'ipympl=0.7.*'\ + 'matplotlib-base=3.4.*' \ 'numba=0.53.*' \ 'numexpr=2.7.*' \ 'pandas=1.2.*' \