Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regular update 2021-04-08 #1263

Merged
merged 2 commits into from
Apr 8, 2021
Merged

Regular update 2021-04-08 #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565af01
Regular update 2021-04-08
romainx Apr 8, 2021
fef734f
Fix DL3046 warning: `useradd` without flag `-l`
romainx Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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.23.0"
HADOLINT_VERSION="v2.1.0"

# Enable BuildKit for Docker build
export DOCKER_BUILDKIT:=1
Expand Down
12 changes: 6 additions & 6 deletions base-notebook/Dockerfile
View file
Open in desktop
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-20210217@sha256:e3d7ff9efd8431d9ef39a144c45992df5502c995b9ba3c53ff70c5b52a848d9c
ARG ROOT_CONTAINER=ubuntu:focal-20210401@sha256:5403064f94b617f7975a19ba4d1a1299fd584397f6ee4393d0e16744ed11aab1

ARG BASE_CONTAINER=$ROOT_CONTAINER
FROM $BASE_CONTAINER
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -86,7 +86,7 @@ RUN sed -i 's/^#force_color_prompt=yes/force_color_prompt=yes/' /etc/skel/.bashr
RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \
sed -i.bak -e 's/^%admin/#%admin/' /etc/sudoers && \
sed -i.bak -e 's/^%sudo/#%sudo/' /etc/sudoers && \
useradd -m -s /bin/bash -N -u $NB_UID $NB_USER && \
useradd -l -m -s /bin/bash -N -u $NB_UID $NB_USER && \
mkdir -p $CONDA_DIR && \
chown $NB_USER:$NB_GID $CONDA_DIR && \
chmod g+w /etc/passwd && \
Expand Down Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions datascience-notebook/Dockerfile
View file
Open in desktop
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.4"
ARG julia_version="1.6.0"
# SHA256 checksum
ARG julia_checksum="80dec351d1a593e8ad152636971a48d0c81bfcfab92c87f3604663616f1e8bc5"
ARG julia_checksum="463b71dc70ca7094c0e0fd6d55d130051a7901e8dec5eb44d6002c57d1bd8585"

# R pre-requisites
RUN apt-get update && \
Expand Down Expand Up @@ -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*' \
Expand Down
2 changes: 1 addition & 1 deletion r-notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*' \
Expand Down
6 changes: 3 additions & 3 deletions scipy-notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*' \
Expand Down