hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-13 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1454 from mathbunnyru/asalikhov/fix_r_installation

Browse Source 
Build r-notebook under arm (again) and fix datascience-notebook build
This commit is contained in:
Erik Sundell
2021-09-03 10:57:54 +02:00
committed by GitHub
parent aa73424366 0f9ab2afd7
commit d7aa878f22
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -14,12 +14,12 @@ OWNER?=jupyter
MULTI_IMAGES:= \ MULTI_IMAGES:= \
base-notebook \ base-notebook \
minimal-notebook \ minimal-notebook \
r-notebook \
scipy-notebook \ scipy-notebook \
pyspark-notebook \ pyspark-notebook \
all-spark-notebook all-spark-notebook
# Images that can only be built on the amd64 architecture (aka. x86_64) # Images that can only be built on the amd64 architecture (aka. x86_64)
AMD64_ONLY_IMAGES:= \ AMD64_ONLY_IMAGES:= \
r-notebook \
datascience-notebook \ datascience-notebook \
tensorflow-notebook tensorflow-notebook
# All of the images # All of the images

16
datascience-notebook/Dockerfile
View File

@@ -74,18 +74,28 @@ RUN mamba install --quiet --yes \
'r-nycflights13' \ 'r-nycflights13' \
'r-randomforest' \ 'r-randomforest' \
'r-rcurl' \ 'r-rcurl' \
'r-rmarkdown' \
'r-rodbc' \ 'r-rodbc' \
'r-rsqlite' \ 'r-rsqlite' \
'r-shiny' \ 'r-shiny' \
'r-tidymodels' \
'r-tidyverse' \
'rpy2' \ 'rpy2' \
'unixodbc' && \ 'unixodbc' && \
mamba clean --all -f -y && \ mamba clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" 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. # Add Julia packages.
# Install IJulia as jovyan and then move the kernelspec out # Install IJulia as jovyan and then move the kernelspec out
# to the system share location. Avoids problems with runtime UID change not # to the system share location. Avoids problems with runtime UID change not

16
r-notebook/Dockerfile
View File

@@ -40,13 +40,23 @@ RUN mamba install --quiet --yes \
'r-nycflights13' \ 'r-nycflights13' \
'r-randomforest' \ 'r-randomforest' \
'r-rcurl' \ 'r-rcurl' \
'r-rmarkdown' \
'r-rodbc' \ 'r-rodbc' \
'r-rsqlite' \ 'r-rsqlite' \
'r-shiny' \ 'r-shiny' \
'r-tidymodels' \
'r-tidyverse' \
'unixodbc' && \ 'unixodbc' && \
mamba clean --all -f -y && \ mamba clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" 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;