Skip to content

Commit

Permalink
Merge pull request #1254 from romainx/update_2021-03-17
Browse files Browse the repository at this point in the history
Regular update 2021-03-17
  • Loading branch information
romainx authored Mar 17, 2021
2 parents d990a62 + d0e066e commit 9fe5186
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ALL_IMAGES:=$(ALL_STACKS)

# Dockerfile Linter
HADOLINT="${HOME}/hadolint"
HADOLINT_VERSION="v1.22.1"
HADOLINT_VERSION="v1.23.0"

# Enable BuildKit for Docker build
export DOCKER_BUILDKIT:=1
Expand Down
2 changes: 1 addition & 1 deletion all-spark-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN conda install --quiet --yes \
'r-ggplot2=3.3*' \
'r-irkernel=1.1*' \
'r-rcurl=1.98*' \
'r-sparklyr=1.5*' \
'r-sparklyr=1.6*' \
&& \
conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \
Expand Down
4 changes: 2 additions & 2 deletions base-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-20210119@sha256:3093096ee188f8ff4531949b8f6115af4747ec1c58858c091c8cb4579c39cc4e
ARG ROOT_CONTAINER=ubuntu:focal-20210217@sha256:e3d7ff9efd8431d9ef39a144c45992df5502c995b9ba3c53ff70c5b52a848d9c

ARG BASE_CONTAINER=$ROOT_CONTAINER
FROM $BASE_CONTAINER
Expand Down Expand Up @@ -134,7 +134,7 @@ RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${m
RUN conda install --quiet --yes \
'notebook=6.2.0' \
'jupyterhub=1.3.0' \
'jupyterlab=3.0.9' && \
'jupyterlab=3.0.11' && \
conda clean --all -f -y && \
npm cache clean --force && \
jupyter notebook --generate-config && \
Expand Down
6 changes: 3 additions & 3 deletions datascience-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.3"
ARG julia_version="1.5.4"
# SHA256 checksum
ARG julia_checksum="f190c938dd6fed97021953240523c9db448ec0a6760b574afd4e9924ab5615f1"
ARG julia_checksum="80dec351d1a593e8ad152636971a48d0c81bfcfab92c87f3604663616f1e8bc5"

# R pre-requisites
RUN apt-get update && \
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN conda install --quiet --yes \
'r-caret=6.0*' \
'r-crayon=1.4*' \
'r-devtools=2.3*' \
'r-forecast=8.13*' \
'r-forecast=8.14*' \
'r-hexbin=1.28*' \
'r-htmltools=0.5*' \
'r-htmlwidgets=1.5*' \
Expand Down
2 changes: 1 addition & 1 deletion r-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN conda install --quiet --yes \
'r-caret=6.*' \
'r-crayon=1.4*' \
'r-devtools=2.3*' \
'r-forecast=8.13*' \
'r-forecast=8.14*' \
'r-hexbin=1.28*' \
'r-htmltools=0.5*' \
'r-htmlwidgets=1.5*' \
Expand Down
8 changes: 4 additions & 4 deletions scipy-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ USER $NB_UID
RUN conda install --quiet --yes \
'beautifulsoup4=4.9.*' \
'conda-forge::blas=*=openblas' \
'bokeh=2.2.*' \
'bokeh=2.3.*' \
'bottleneck=1.3.*' \
'cloudpickle=1.6.*' \
'cython=0.29.*' \
'dask=2021.2.*' \
'dask=2021.3.*' \
'dill=0.3.*' \
'h5py=3.1.*' \
'ipywidgets=7.6.*' \
'ipympl=0.6.*'\
'matplotlib-base=3.3.*' \
'numba=0.52.*' \
'numba=0.53.*' \
'numexpr=2.7.*' \
'pandas=1.2.*' \
'patsy=0.5.*' \
Expand All @@ -38,7 +38,7 @@ RUN conda install --quiet --yes \
'scikit-learn=0.24.*' \
'scipy=1.6.*' \
'seaborn=0.11.*' \
'sqlalchemy=1.3.*' \
'sqlalchemy=1.4.*' \
'statsmodels=0.12.*' \
'sympy=1.7.*' \
'vincent=0.4.*' \
Expand Down

0 comments on commit 9fe5186

Please sign in to comment.