From b6de9ce5b6cd5e94822b8a8b921f8ca8377d30c9 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 3 Sep 2021 07:00:37 +0000 Subject: [PATCH 1/4] Build r-notebook under arm (again) --- r-notebook/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index d2110b15..6b544bae 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -40,13 +40,23 @@ RUN mamba install --quiet --yes \ 'r-nycflights13' \ 'r-randomforest' \ 'r-rcurl' \ - 'r-rmarkdown' \ 'r-rodbc' \ 'r-rsqlite' \ 'r-shiny' \ - 'r-tidymodels' \ - 'r-tidyverse' \ 'unixodbc' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" + +# These packages are not easy to install under arm +RUN set -x && \ + arch=$(uname -m) && \ + if [ "${arch}" == "x86_64" ]; then \ + mamba install --quiet --yes \ + 'r-rmarkdown' \ + 'r-tidymodels' \ + 'r-tidyverse' && \ + mamba clean --all -f -y && \ + fix-permissions "${CONDA_DIR}" && \ + fix-permissions "/home/${NB_USER}"; \ + fi; \ From 9df624dd2e16e4e902921350c30e6741aca78e5b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 3 Sep 2021 10:01:39 +0300 Subject: [PATCH 2/4] Enable actual build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 67f4dcfd..b8b782d3 100644 --- a/Makefile +++ b/Makefile @@ -14,12 +14,12 @@ OWNER?=jupyter MULTI_IMAGES:= \ base-notebook \ minimal-notebook \ + r-notebook \ scipy-notebook \ pyspark-notebook \ all-spark-notebook # Images that can only be built on the amd64 architecture (aka. x86_64) AMD64_ONLY_IMAGES:= \ - r-notebook \ datascience-notebook \ tensorflow-notebook # All of the images From 099bdad557ec9699d2d8d9b67a8770df2c791091 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 3 Sep 2021 10:02:59 +0300 Subject: [PATCH 3/4] Fix datascience notebook --- datascience-notebook/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index f7a586de..54f48d28 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -74,18 +74,28 @@ RUN mamba install --quiet --yes \ 'r-nycflights13' \ 'r-randomforest' \ 'r-rcurl' \ - 'r-rmarkdown' \ 'r-rodbc' \ 'r-rsqlite' \ 'r-shiny' \ - 'r-tidymodels' \ - 'r-tidyverse' \ 'rpy2' \ 'unixodbc' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" +# These packages are not easy to install under arm +RUN set -x && \ + arch=$(uname -m) && \ + if [ "${arch}" == "x86_64" ]; then \ + mamba install --quiet --yes \ + 'r-rmarkdown' \ + 'r-tidymodels' \ + 'r-tidyverse' && \ + mamba clean --all -f -y && \ + fix-permissions "${CONDA_DIR}" && \ + fix-permissions "/home/${NB_USER}"; \ + fi; \ + # Add Julia packages. # Install IJulia as jovyan and then move the kernelspec out # to the system share location. Avoids problems with runtime UID change not From 0f9ab2afd71e9dc67197f9965f3719de4c0b55b6 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 3 Sep 2021 10:12:38 +0300 Subject: [PATCH 4/4] Fix style --- datascience-notebook/Dockerfile | 2 +- r-notebook/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 54f48d28..2cffa915 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -94,7 +94,7 @@ RUN set -x && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}"; \ - fi; \ + fi; # Add Julia packages. # Install IJulia as jovyan and then move the kernelspec out diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 6b544bae..4083e58f 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -59,4 +59,4 @@ RUN set -x && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}"; \ - fi; \ + fi;