From fbceaa989202ecdf6bc80f6f62c0f35e85ccf791 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sat, 22 May 2021 14:01:01 +0300 Subject: [PATCH] Fixes --- all-spark-notebook/Dockerfile | 4 +-- base-notebook/Dockerfile | 4 +-- datascience-notebook/Dockerfile | 4 +-- docs/using/recipes.md | 38 +++++++++------------ examples/docker-compose/notebook/Dockerfile | 2 +- examples/make-deploy/Dockerfile | 2 +- minimal-notebook/Dockerfile | 7 ++-- pyspark-notebook/Dockerfile | 4 +-- r-notebook/Dockerfile | 4 +-- scipy-notebook/Dockerfile | 4 +-- 10 files changed, 34 insertions(+), 39 deletions(-) diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index cf864edc..ce624c9b 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -12,8 +12,8 @@ ENV R_LIBS_USER $SPARK_HOME/R/lib RUN fix-permissions $R_LIBS_USER # R pre-requisites -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ fonts-dejavu \ gfortran \ gcc && \ diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index c036076d..d8c709c9 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -44,8 +44,8 @@ ARG miniforge_checksum="d4065b376f81b83cfef0c7316f97bb83337e4ae27eb988828363a578 # Install all OS dependencies for notebook server that starts but lacks all # features (e.g., download as all possible file formats) ENV DEBIAN_FRONTEND noninteractive -RUN apt-get -q update && \ - apt-get install -yq --no-install-recommends \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ tini \ wget \ ca-certificates \ diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 62ce058c..2e26cc49 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -19,8 +19,8 @@ ARG julia_version="1.6.0" ARG julia_checksum="463b71dc70ca7094c0e0fd6d55d130051a7901e8dec5eb44d6002c57d1bd8585" # R pre-requisites -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ fonts-dejavu \ gfortran \ gcc && \ diff --git a/docs/using/recipes.md b/docs/using/recipes.md index 6863d744..5d8f5f49 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -253,11 +253,10 @@ FROM $BASE_CONTAINER USER root # Remove the manpage blacklist, install man, install docs -RUN rm /etc/dpkg/dpkg.cfg.d/excludes \ - && apt-get update \ - && dpkg -l | grep ^ii | cut -d' ' -f3 | xargs apt-get install -yq --no-install-recommends --reinstall man \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* +RUN rm /etc/dpkg/dpkg.cfg.d/excludes && \ + apt-get update --yes && \ + dpkg -l | grep ^ii | cut -d' ' -f3 | xargs apt-get install --yes --no-install-recommends --reinstall man && \ + apt-get clean && rm -rf /var/lib/apt/lists/* USER $NB_UID ``` @@ -280,10 +279,9 @@ For Ubuntu 18.04 (bionic) and earlier, you may also require to workaround for a # https://git.savannah.gnu.org/cgit/man-db.git/commit/?id=8197d7824f814c5d4b992b4c8730b5b0f7ec589a # https://launchpadlibrarian.net/435841763/man-db_2.8.5-2_2.8.6-1.diff.gz -RUN echo "MANPATH_MAP ${CONDA_DIR}/bin ${CONDA_DIR}/man" >> /etc/manpath.config \ - && echo "MANPATH_MAP ${CONDA_DIR}/bin ${CONDA_DIR}/share/man" >> /etc/manpath.config \ - && mandb - +RUN echo "MANPATH_MAP ${CONDA_DIR}/bin ${CONDA_DIR}/man" >> /etc/manpath.config && \ + echo "MANPATH_MAP ${CONDA_DIR}/bin ${CONDA_DIR}/share/man" >> /etc/manpath.config && \ + mandb ``` Be sure to check the current base image in `base-notebook` before building. @@ -417,21 +415,19 @@ ENV HADOOP_CONF_DIR /usr/local/hadoop-2.7.3/etc/hadoop USER root # Add proper open-jdk-8 not just the jre, needed for pydoop RUN echo 'deb https://cdn-fastly.deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list && \ - apt-get -y update && \ - apt-get install --no-install-recommends -t jessie-backports -y openjdk-8-jdk && \ + apt-get update --yes && \ + apt-get install --yes --no-install-recommends -t jessie-backports openjdk-8-jdk && \ rm /etc/apt/sources.list.d/jessie-backports.list && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/ && \ + apt-get clean && rm -rf /var/lib/apt/lists/* && \ # Add hadoop binaries wget https://mirrors.ukfast.co.uk/sites/ftp.apache.org/hadoop/common/hadoop-2.7.3/hadoop-2.7.3.tar.gz && \ tar -xvf hadoop-2.7.3.tar.gz -C /usr/local && \ chown -R $NB_USER:users /usr/local/hadoop-2.7.3 && \ rm -f hadoop-2.7.3.tar.gz && \ # Install os dependencies required for pydoop, pyhive - apt-get update && \ - apt-get install --no-install-recommends -y build-essential python-dev libsasl2-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ + apt-get update --yes && \ + apt-get install --yes --no-install-recommends build-essential python-dev libsasl2-dev && \ + apt-get clean && rm -rf /var/lib/apt/lists/* && \ # Remove the example hadoop configs and replace # with those for our cluster. # Alternatively this could be mounted as a volume @@ -521,11 +517,9 @@ FROM jupyter/scipy-notebook:latest USER root # autosklearn requires swig, which no other image has -RUN apt-get update && \ - apt-get install -y --no-install-recommends swig && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends swig && \ + apt-get clean && rm -rf /var/lib/apt/lists/* USER $NB_UID diff --git a/examples/docker-compose/notebook/Dockerfile b/examples/docker-compose/notebook/Dockerfile index b16d0edb..fdba3bb5 100644 --- a/examples/docker-compose/notebook/Dockerfile +++ b/examples/docker-compose/notebook/Dockerfile @@ -7,7 +7,7 @@ FROM jupyter/minimal-notebook:55d5ca6be183 USER root # Add permanent apt-get installs and other root commands here -# e.g., RUN apt-get install npm nodejs +# e.g., RUN apt-get install --yes --no-install-recommends npm nodejs USER $NB_UID diff --git a/examples/make-deploy/Dockerfile b/examples/make-deploy/Dockerfile index c0efbfbd..d88ec487 100644 --- a/examples/make-deploy/Dockerfile +++ b/examples/make-deploy/Dockerfile @@ -7,7 +7,7 @@ FROM jupyter/minimal-notebook:2d125a7161b5 USER root # Add permanent apt-get installs and other root commands here -# e.g., RUN apt-get install npm nodejs +# e.g., RUN apt-get install --yes --no-install-recommends npm nodejs USER $NB_UID diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index e924aaf5..bf416361 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -8,7 +8,8 @@ LABEL maintainer="Jupyter Project " USER root # Install all OS dependencies for fully functional notebook server -RUN apt-get update && apt-get install -yq --no-install-recommends \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ build-essential \ vim-tiny \ git \ @@ -25,8 +26,8 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \ # ---- tzdata \ unzip \ - nano-tiny \ - && apt-get clean && rm -rf /var/lib/apt/lists/* + nano-tiny && \ + apt-get clean && rm -rf /var/lib/apt/lists/* # Create alternative for nano -> nano-tiny RUN update-alternatives --install /usr/bin/nano nano /bin/nano-tiny 10 diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 6c24329d..711e971e 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -21,8 +21,8 @@ ARG openjdk_version="11" ENV APACHE_SPARK_VERSION="${spark_version}" \ HADOOP_VERSION="${hadoop_version}" -RUN apt-get -y update && \ - apt-get install --no-install-recommends -y \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ "openjdk-${openjdk_version}-jre-headless" \ ca-certificates-java && \ apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 5b5e7b59..e6da2fd3 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -8,8 +8,8 @@ LABEL maintainer="Jupyter Project " USER root # R pre-requisites -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends \ fonts-dejavu \ unixodbc \ unixodbc-dev \ diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index bedbaa02..6c3adda6 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -8,8 +8,8 @@ LABEL maintainer="Jupyter Project " USER root # ffmpeg for matplotlib anim & dvipng+cm-super for latex labels -RUN apt-get update && \ - apt-get install -y --no-install-recommends ffmpeg dvipng cm-super && \ +RUN apt-get update --yes && \ + apt-get install --yes --no-install-recommends ffmpeg dvipng cm-super && \ apt-get clean && rm -rf /var/lib/apt/lists/* USER $NB_UID