From fa432cf6415d697701bed78de346237b242bdf41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Thu, 8 Dec 2022 15:31:56 +0100 Subject: [PATCH 1/8] Update Dockerfile --- docker-stacks-foundation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-stacks-foundation/Dockerfile b/docker-stacks-foundation/Dockerfile index 9d048a3ea3..07536c0d31 100644 --- a/docker-stacks-foundation/Dockerfile +++ b/docker-stacks-foundation/Dockerfile @@ -77,7 +77,7 @@ RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \ USER ${NB_UID} # Pin python version here, or set it to "default" -ARG PYTHON_VERSION=3.10 +ARG PYTHON_VERSION=3.11 # Setup work directory for backward-compatibility RUN mkdir "/home/${NB_USER}/work" && \ From 89975edf1720544ecf450ce71ed9cbf5bc06b39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Thu, 8 Dec 2022 15:33:21 +0100 Subject: [PATCH 2/8] Update test_python.py --- tests/docker-stacks-foundation/test_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-stacks-foundation/test_python.py b/tests/docker-stacks-foundation/test_python.py index 8a41bebcf2..fe585b725b 100644 --- a/tests/docker-stacks-foundation/test_python.py +++ b/tests/docker-stacks-foundation/test_python.py @@ -5,7 +5,7 @@ from tests.conftest import TrackedContainer LOGGER = logging.getLogger(__name__) -EXPECTED_PYTHON_VERSION = "3.10" +EXPECTED_PYTHON_VERSION = "3.11" def test_python_version(container: TrackedContainer) -> None: From 505fa678cdae5af87a07aedc65ff55f550976e7e Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 20 Jan 2023 13:00:04 +0400 Subject: [PATCH 3/8] [TMP] Do not install numba --- scipy-notebook/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 50da610997..4e979b7fea 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -42,7 +42,6 @@ RUN mamba install --quiet --yes \ # Temporary fix for: https://github.com/jupyter/docker-stacks/issues/1851 'jupyter_server>=2.0.0' \ 'matplotlib-base' \ - 'numba' \ 'numexpr' \ 'openpyxl' \ 'pandas' \ From 2b36986f92c8e7188a32640b2285220bc068dcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn?= Date: Tue, 7 Mar 2023 18:02:04 +0100 Subject: [PATCH 4/8] test with spark 3.4 rc2 --- pyspark-notebook/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 830c42b2d1..08a85e30eb 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -15,10 +15,10 @@ USER root # Spark dependencies # Default values can be overridden at build time # (ARGS are in lower case to distinguish them from ENV) -ARG spark_version="3.3.2" +ARG spark_version="3.4.0" ARG hadoop_version="3" ARG scala_version -ARG spark_checksum="4cd2396069fbe0f8efde2af4fd301bf46f8c6317e9dea1dd42a405de6a38380635d49b17972cb92c619431acece2c3af4c23bfdf193cedb3ea913ed69ded23a1" +ARG spark_checksum="7f8c4c2371f14dec9f7e9ead606adcbbfaa05772ef575dfac1c8437f5459ca8f344cef47f999076b631003986f00f27ac3513b34265f43a46f8f66fbce0e14ca" ARG openjdk_version="17" ENV APACHE_SPARK_VERSION="${spark_version}" \ @@ -36,7 +36,7 @@ WORKDIR /tmp # You need to use https://archive.apache.org/dist/ website if you want to download old Spark versions # But it seems to be slower, that's why we use recommended site for download RUN if [ -z "${scala_version}" ]; then \ - wget -qO "spark.tgz" "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz"; \ + wget -qO "spark.tgz" https://dist.apache.org/repos/dist/dev/spark/v3.4.0-rc2-bin/spark-3.4.0-bin-hadoop3.tgz; \ else \ wget -qO "spark.tgz" "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala${scala_version}.tgz"; \ fi && \ From f9b8b3f786d49b50cfca6d1fe20d0a2aa7ffcd32 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 19 May 2023 10:26:09 +0400 Subject: [PATCH 5/8] Update Dockerfile --- scipy-notebook/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 31ac362b99..c47ab18716 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -43,6 +43,7 @@ RUN mamba install --yes \ 'jupyter_server>=2.0.0' \ 'jupyterlab-git' \ 'matplotlib-base' \ + 'numba' \ 'numexpr' \ 'openpyxl' \ 'pandas' \ From e6aedc7360fb07c0300a035c3f35da2e109f87ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn?= Date: Wed, 31 May 2023 18:03:19 +0200 Subject: [PATCH 6/8] install tf with pip in conda --- tensorflow-notebook/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index 25492de4f6..16bb7e615b 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -10,9 +10,10 @@ LABEL maintainer="Jupyter Project " # Fix: https://github.com/koalaman/shellcheck/wiki/SC3014 SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install Tensorflow +# Install Tensorflow with pip RUN mamba install --yes \ - 'tensorflow' && \ + 'pip' && \ mamba clean --all -f -y && \ + pip install tensorflow && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" From 9e46992279368e73a65f68d78db1f79cef720926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn?= Date: Wed, 31 May 2023 19:29:51 +0200 Subject: [PATCH 7/8] remove mamba install pip --- tensorflow-notebook/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index 16bb7e615b..b7583ee4d6 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -11,9 +11,6 @@ LABEL maintainer="Jupyter Project " SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install Tensorflow with pip -RUN mamba install --yes \ - 'pip' && \ - mamba clean --all -f -y && \ - pip install tensorflow && \ +RUN pip install tensorflow --no-cache-dir && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" From f70336bda106743013dde6c022ed7796e36553b4 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 1 Jun 2023 15:25:41 +0400 Subject: [PATCH 8/8] Update Dockerfile --- tensorflow-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index b7583ee4d6..51070fdc8e 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -11,6 +11,6 @@ LABEL maintainer="Jupyter Project " SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install Tensorflow with pip -RUN pip install tensorflow --no-cache-dir && \ +RUN pip install --no-cache-dir tensorflow && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}"