From 2c387e8df5f72892f04605d607c71072448aec10 Mon Sep 17 00:00:00 2001
From: Mish <10400064+mishushakov@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:19:07 +0200
Subject: [PATCH 1/3] update r kernel installation, remove dependency on
 rstudio cdn

---
 template/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/Dockerfile b/template/Dockerfile
index a4bb24d0..645897e6 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.12
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends \
-  build-essential curl git util-linux jq sudo fonts-noto-cjk
+  build-essential curl git util-linux jq sudo fonts-noto-cjk r-base
 
 # Install Node.js 20.x from NodeSource
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
@@ -23,7 +23,6 @@ COPY ./requirements.txt requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3" --user
 
 # R Kernel
-RUN curl -O https://cdn.rstudio.com/r/debian-12/pkgs/r-${R_VERSION}_1_amd64.deb && sudo apt-get update && sudo apt-get install -y ./r-${R_VERSION}_1_amd64.deb && ln -s ${R_HOME}/bin/R /usr/bin/R
 RUN R -e "install.packages('IRkernel', repos='https://cloud.r-project.org')"
 RUN R -e "IRkernel::installspec(user = FALSE, name = 'r', displayname = 'R')"
 

From 73d8285656b76485015259b141fce82ba3fc9fe7 Mon Sep 17 00:00:00 2001
From: Mish <10400064+mishushakov@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:48:19 +0200
Subject: [PATCH 2/3] remove unnecessary env vars

---
 template/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/template/Dockerfile b/template/Dockerfile
index 645897e6..9b510232 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -13,10 +13,8 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
   JUPYTER_CONFIG_PATH="/root/.jupyter" \
   IPYTHON_CONFIG_PATH="/root/.ipython" \
   SERVER_PATH="/root/.server" \
-  R_VERSION=4.4.2
 
-ENV R_HOME=/opt/R/${R_VERSION} \
-    JAVA_HOME=/opt/java/openjdk
+ENV JAVA_HOME=/opt/java/openjdk
 
 # Install Jupyter
 COPY ./requirements.txt requirements.txt

From ead5bc94223e91a0520fe2b887ffe65eefa9757c Mon Sep 17 00:00:00 2001
From: Mish <10400064+mishushakov@users.noreply.github.com>
Date: Wed, 20 Aug 2025 13:03:21 +0200
Subject: [PATCH 3/3] fixed env syntax

---
 template/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/Dockerfile b/template/Dockerfile
index 9b510232..814c14c0 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -13,8 +13,7 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
   JUPYTER_CONFIG_PATH="/root/.jupyter" \
   IPYTHON_CONFIG_PATH="/root/.ipython" \
   SERVER_PATH="/root/.server" \
-
-ENV JAVA_HOME=/opt/java/openjdk
+  JAVA_HOME=/opt/java/openjdk
 
 # Install Jupyter
 COPY ./requirements.txt requirements.txt