mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-18 07:22:57 +00:00
Regular update + improvements
This commit is contained in:
2
Makefile
2
Makefile
@@ -25,7 +25,7 @@ ALL_IMAGES:=$(ALL_STACKS)
|
|||||||
|
|
||||||
# Dockerfile Linter
|
# Dockerfile Linter
|
||||||
HADOLINT="${HOME}/hadolint"
|
HADOLINT="${HOME}/hadolint"
|
||||||
HADOLINT_VERSION="v1.18.2"
|
HADOLINT_VERSION="v1.19.0"
|
||||||
|
|
||||||
help:
|
help:
|
||||||
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
|
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
|
||||||
|
@@ -27,7 +27,7 @@ RUN conda install --quiet --yes \
|
|||||||
'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.4*' \
|
'r-sparklyr=1.5*' \
|
||||||
&& \
|
&& \
|
||||||
conda clean --all -f -y && \
|
conda clean --all -f -y && \
|
||||||
fix-permissions "${CONDA_DIR}" && \
|
fix-permissions "${CONDA_DIR}" && \
|
||||||
|
@@ -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-20201008@sha256:1d7b639619bdca2d008eca2d5293e3c43ff84cbee597ff76de3b7a7de3e84956
|
ARG ROOT_CONTAINER=ubuntu:focal-20201106@sha256:4e4bc990609ed865e07afc8427c30ffdddca5153fd4e82c20d8f0783a291e241
|
||||||
|
|
||||||
ARG BASE_CONTAINER=$ROOT_CONTAINER
|
ARG BASE_CONTAINER=$ROOT_CONTAINER
|
||||||
FROM $BASE_CONTAINER
|
FROM $BASE_CONTAINER
|
||||||
@@ -46,7 +46,6 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -yq --no-install-recommends \
|
&& apt-get install -yq --no-install-recommends \
|
||||||
wget \
|
wget \
|
||||||
bzip2 \
|
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
sudo \
|
sudo \
|
||||||
locales \
|
locales \
|
||||||
@@ -68,7 +67,8 @@ ENV CONDA_DIR=/opt/conda \
|
|||||||
LANGUAGE=en_US.UTF-8
|
LANGUAGE=en_US.UTF-8
|
||||||
ENV PATH=$CONDA_DIR/bin:$PATH \
|
ENV PATH=$CONDA_DIR/bin:$PATH \
|
||||||
HOME=/home/$NB_USER \
|
HOME=/home/$NB_USER \
|
||||||
CONDA_VERSION="${conda_version}"
|
CONDA_VERSION="${conda_version}" \
|
||||||
|
MINIFORGE_VERSION="${miniforge_version}"
|
||||||
|
|
||||||
# Copy a script that we will use to correct permissions after running certain commands
|
# Copy a script that we will use to correct permissions after running certain commands
|
||||||
COPY fix-permissions /usr/local/bin/fix-permissions
|
COPY fix-permissions /usr/local/bin/fix-permissions
|
||||||
@@ -102,6 +102,7 @@ RUN mkdir "/home/$NB_USER/work" && \
|
|||||||
# Install conda as jovyan and check the sha256 sum provided on the download site
|
# Install conda as jovyan and check the sha256 sum provided on the download site
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
|
|
||||||
|
# Prerequisites installation: conda, pip, tini
|
||||||
RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${miniforge_version}/${miniforge_installer}" && \
|
RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${miniforge_version}/${miniforge_installer}" && \
|
||||||
echo "${miniforge_checksum} *${miniforge_installer}" | sha256sum --check && \
|
echo "${miniforge_checksum} *${miniforge_installer}" | sha256sum --check && \
|
||||||
/bin/bash "${miniforge_installer}" -f -b -p $CONDA_DIR && \
|
/bin/bash "${miniforge_installer}" -f -b -p $CONDA_DIR && \
|
||||||
@@ -112,18 +113,14 @@ RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${m
|
|||||||
conda config --system --set show_channel_urls true && \
|
conda config --system --set show_channel_urls true && \
|
||||||
if [ ! $PYTHON_VERSION = 'default' ]; then conda install --yes python=$PYTHON_VERSION; fi && \
|
if [ ! $PYTHON_VERSION = 'default' ]; then conda install --yes python=$PYTHON_VERSION; fi && \
|
||||||
conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \
|
conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \
|
||||||
conda install --quiet --yes "conda=${CONDA_VERSION}" && \
|
conda install --quiet --yes \
|
||||||
conda install --quiet --yes pip && \
|
"conda=${CONDA_VERSION}" \
|
||||||
|
'pip' \
|
||||||
|
'tini=0.18.0' && \
|
||||||
conda update --all --quiet --yes && \
|
conda update --all --quiet --yes && \
|
||||||
conda clean --all -f -y && \
|
|
||||||
rm -rf /home/$NB_USER/.cache/yarn && \
|
|
||||||
fix-permissions $CONDA_DIR && \
|
|
||||||
fix-permissions /home/$NB_USER
|
|
||||||
|
|
||||||
# Install Tini
|
|
||||||
RUN conda install --quiet --yes 'tini=0.18.0' && \
|
|
||||||
conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \
|
conda list tini | grep tini | tr -s ' ' | cut -d ' ' -f 1,2 >> $CONDA_DIR/conda-meta/pinned && \
|
||||||
conda clean --all -f -y && \
|
conda clean --all -f -y && \
|
||||||
|
rm -rf /home/$NB_USER/.cache/yarn && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
|
||||||
@@ -134,8 +131,8 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
|
|||||||
# Do all this in a single RUN command to avoid duplicating all of the
|
# Do all this in a single RUN command to avoid duplicating all of the
|
||||||
# files across image layers when the permissions change
|
# files across image layers when the permissions change
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
'notebook=6.1.4' \
|
'notebook=6.1.5' \
|
||||||
'jupyterhub=1.2.1' \
|
'jupyterhub=1.2.2' \
|
||||||
'jupyterlab=2.2.9' && \
|
'jupyterlab=2.2.9' && \
|
||||||
conda clean --all -f -y && \
|
conda clean --all -f -y && \
|
||||||
npm cache clean --force && \
|
npm cache clean --force && \
|
||||||
|
@@ -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.2"
|
ARG julia_version="1.5.3"
|
||||||
# SHA256 checksum
|
# SHA256 checksum
|
||||||
ARG julia_checksum="6da704fadcefa39725503e4c7a9cfa1a570ba8a647c4bd8de69a118f43584630"
|
ARG julia_checksum="f190c938dd6fed97021953240523c9db448ec0a6760b574afd4e9924ab5615f1"
|
||||||
|
|
||||||
# R pre-requisites
|
# R pre-requisites
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
|
@@ -24,7 +24,7 @@ RUN conda install --quiet --yes \
|
|||||||
'cython=0.29.*' \
|
'cython=0.29.*' \
|
||||||
'dask=2.30.*' \
|
'dask=2.30.*' \
|
||||||
'dill=0.3.*' \
|
'dill=0.3.*' \
|
||||||
'h5py=2.10.*' \
|
'h5py=3.1.*' \
|
||||||
'ipywidgets=7.5.*' \
|
'ipywidgets=7.5.*' \
|
||||||
'ipympl=0.5.*'\
|
'ipympl=0.5.*'\
|
||||||
'matplotlib-base=3.3.*' \
|
'matplotlib-base=3.3.*' \
|
||||||
@@ -40,7 +40,7 @@ RUN conda install --quiet --yes \
|
|||||||
'seaborn=0.11.*' \
|
'seaborn=0.11.*' \
|
||||||
'sqlalchemy=1.3.*' \
|
'sqlalchemy=1.3.*' \
|
||||||
'statsmodels=0.12.*' \
|
'statsmodels=0.12.*' \
|
||||||
'sympy=1.6.*' \
|
'sympy=1.7.*' \
|
||||||
'vincent=0.4.*' \
|
'vincent=0.4.*' \
|
||||||
'widgetsnbextension=3.5.*'\
|
'widgetsnbextension=3.5.*'\
|
||||||
'xlrd=1.2.*' \
|
'xlrd=1.2.*' \
|
||||||
|
Reference in New Issue
Block a user