Merge pull request #1736 from mathbunnyru/asalikhov/enable_arm_datasc…

…ience

Build aarch64 datascience-notebook

.github/actions/download-manifests/action.yml

@@ -63,6 +63,11 @@ runs:
  with:
  name: tensorflow-notebook-amd64-history_line
  path: ${{ inputs.histLineDir }}
+ - name: Download artifact 📥
+ uses: actions/download-artifact@v3
+ with:
+ name: datascience-notebook-aarch64-history_line
+ path: ${{ inputs.histLineDir }}
  - name: Download artifact 📥
  uses: actions/download-artifact@v3
  with:
@@ -134,6 +139,11 @@ runs:
  with:
  name: tensorflow-notebook-amd64-manifest
  path: ${{ inputs.manifestDir }}
+ - name: Download artifact 📥
+ uses: actions/download-artifact@v3
+ with:
+ name: datascience-notebook-aarch64-manifest
+ path: ${{ inputs.manifestDir }}
  - name: Download artifact 📥
  uses: actions/download-artifact@v3
  with:

.github/workflows/docker.yml

@@ -145,6 +145,15 @@ jobs:
  platform: amd64
  runsOn: ubuntu-latest
 
+ aarch64-datascience:
+ needs: [aarch64-scipy]
+ uses: ./.github/workflows/docker-build-test-upload.yml
+ with:
+ parentImage: scipy-notebook
+ image: datascience-notebook
+ platform: aarch64
+ runsOn: ARM64
+
  amd64-datascience:
  needs: [amd64-scipy]
  uses: ./.github/workflows/docker-build-test-upload.yml
@@ -200,6 +209,7 @@ jobs:
  aarch64-minimal,
  aarch64-scipy,
  aarch64-r,
+ aarch64-datascience,
  aarch64-pyspark,
  aarch64-all-spark,
  ]
@@ -216,6 +226,7 @@ jobs:
  "minimal-notebook",
  "scipy-notebook",
  "r-notebook",
+ "datascience-notebook",
  "pyspark-notebook",
  "all-spark-notebook"
  ]

README.md

@@ -115,6 +115,6 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st
 
 ## CPU Architectures
 
-- We publish containers for both `amd64` (`x86_64`) and `aarch64` platforms, except for `datascience-notebook` and `tensorflow-notebook`, which only support `amd64` for now
+- We publish containers for both `amd64` (`x86_64`) and `aarch64` platforms, except for `tensorflow-notebook`, which only supports `amd64` for now
 - We do not create multi-platform images
 - Instead, all `arm64` images have _aarch64-_ tag prefix, for example `jupyter/base-notebook:aarch64-python-3.10.5`

datascience-notebook/Dockerfile

@@ -80,17 +80,17 @@ RUN mamba install --quiet --yes \
  'r-rsqlite' \
  'r-shiny' \
  'r-tidyverse' \
- 'rpy2' \
  'unixodbc' && \
  mamba clean --all -f -y && \
  fix-permissions "${CONDA_DIR}" && \
  fix-permissions "/home/${NB_USER}"
 
-# `r-tidymodels` is not easy to install under arm
+# `rpy2` and `r-tidymodels` are not easy to install under aarch64
 RUN set -x && \
  arch=$(uname -m) && \
  if [ "${arch}" == "x86_64" ]; then \
  mamba install --quiet --yes \
+ 'rpy2' \
  'r-tidymodels' && \
  mamba clean --all -f -y && \
  fix-permissions "${CONDA_DIR}" && \