refactor(datascience): merge r-build steps

datascience-notebook/Dockerfile

@@ -54,6 +54,7 @@ LABEL maintainer="CourseKata <[email protected]>"
 
 # install cmdstan and related requests
 RUN --mount=type=cache,target=${CONDA_DIR}/pkgs,uid=${NB_UID},sharing=locked \
+  # install packages from conda where possible
   mamba install --yes \
   "r-brms" \
   # "r-ggstatsplot" \
@@ -81,10 +82,10 @@ RUN --mount=type=cache,target=${CONDA_DIR}/pkgs,uid=${NB_UID},sharing=locked \
     "r-zeallot" \
   # "r-rethinking"
     "r-coda" \
-    "r-digest"
+    "r-digest" \
   # "r-rstanarm"
-
-RUN R_REMOTES_UPGRADE="never" Rscript \
+  # install all other R packages
+  && R_REMOTES_UPGRADE="never" Rscript \
   -e 'stan <- "https://mc-stan.org/r-packages/"' \
   -e 'remotes::install_cran("cmdstanr", repos = c(stan, getOption("repos")), dependencies = TRUE)' \
   -e 'cmdstanr::install_cmdstan()' \

r-notebook/Dockerfile

@@ -37,11 +37,11 @@ RUN --mount=type=bind,source="${PY_REQUIREMENTS}",target=/tmp/requirements.txt \
 FROM ${PARENT_IMAGE} as final
 LABEL maintainer="CourseKata <[email protected]>"
 
-# install R packages from conda where possible
 ARG R_REQUIREMENTS
 RUN --mount=type=cache,target=${CONDA_DIR}/pkgs,uid=${NB_UID},sharing=locked \
   --mount=type=bind,source="${R_REQUIREMENTS}",target=/tmp/requirements.r \
   --mount=type=secret,id=github_token,uid=${NB_UID} \
+  # install R packages from conda where possible
   mamba install --yes \
     "r-av" \
     "r-bayesplot" \