From cde8b4389ade5d150180dd9f93408fb90bd4f1d6 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Sat, 18 Feb 2023 00:47:46 +0400
Subject: [PATCH] Install r-tidymodels on aarch64 images (#1879)

---
 datascience-notebook/Dockerfile | 12 +-----------
 r-notebook/Dockerfile           | 12 +-----------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
index 5f38bf222..0cd32198d 100644
--- a/datascience-notebook/Dockerfile
+++ b/datascience-notebook/Dockerfile
@@ -79,6 +79,7 @@ RUN mamba install --quiet --yes \
     'r-rodbc' \
     'r-rsqlite' \
     'r-shiny' \
+    'r-tidymodels' \
     'r-tidyverse' \
     'rpy2' \
     'unixodbc' && \
@@ -86,17 +87,6 @@ RUN mamba install --quiet --yes \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
 
-# `r-tidymodels` is not easy to install under aarch64
-RUN set -x && \
-    arch=$(uname -m) && \
-    if [ "${arch}" == "x86_64" ]; then \
-        mamba install --quiet --yes \
-            'r-tidymodels' && \
-            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
diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index 3319a802b..5f939f3d6 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -45,19 +45,9 @@ RUN mamba install --quiet --yes \
     '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}"
-
-# `r-tidymodels` is not easy to install under arm
-RUN set -x && \
-    arch=$(uname -m) && \
-    if [ "${arch}" == "x86_64" ]; then \
-        mamba install --quiet --yes \
-            'r-tidymodels' && \
-            mamba clean --all -f -y && \
-            fix-permissions "${CONDA_DIR}" && \
-            fix-permissions "/home/${NB_USER}"; \
-    fi;