base: Connect to RStudio via unix socket

- https://github.com/jupyterhub/jupyter-rsession-proxy/pull/159

base/.gitlab-ci.yml

 .env:
   variables:
     R_VERSION: "4.4.2"
+    RSTUDIO_VERSION: "2024.12.0+467"
     TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"
 
@@ -67,6 +68,7 @@ build:latest-linux-amd64:
       --build-arg BASE_IMAGE_TAG
       --build-arg BUILD_ON_IMAGE
       --build-arg R_VERSION
+      --build-arg RSTUDIO_VERSION
       --build-arg CUDA_IMAGE_FLAVOR
       --build-arg CUDA_IMAGE_LICENSE
       --build-arg NCPUS=$((`nproc`/2+1))
@@ -114,6 +116,7 @@ build:latest-linux-arm64v8:
       --build-arg BASE_IMAGE_TAG
       --build-arg BUILD_ON_IMAGE
       --build-arg R_VERSION
+      --build-arg RSTUDIO_VERSION
       --build-arg CUDA_IMAGE_FLAVOR
       --build-arg CUDA_IMAGE_LICENSE
       --build-arg NCPUS=$((`nproc`/2+1))

base/latest.Dockerfile

@@ -10,7 +10,7 @@ ARG JUPYTERHUB_VERSION=5.2.1
 ARG JUPYTERLAB_VERSION=4.3.4
 ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
 ARG CODE_SERVER_VERSION=4.96.2
-ARG RSTUDIO_VERSION=2024.12.0+467
+ARG RSTUDIO_VERSION
 ARG NEOVIM_VERSION=0.10.3
 ARG GIT_VERSION=2.47.1
 ARG GIT_LFS_VERSION=3.6.0
@@ -78,7 +78,18 @@ FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi
 FROM glcr.b-data.ch/git/gsi/${GIT_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} AS gsi
 FROM glcr.b-data.ch/git-lfs/glfsi:${GIT_LFS_VERSION} AS glfsi
 
-FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR}
+FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base
+
+FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base-rstudio
+
+ARG RSTUDIO_VERSION
+
+ENV RSTUDIO_VERSION=${RSTUDIO_VERSION}
+
+## Connect to RStudio via unix socket
+ENV JUPYTER_RSESSION_PROXY_USE_SOCKET=1
+
+FROM base${RSTUDIO_VERSION:+-rstudio}
 
 ARG NCPUS=1
 
@@ -92,7 +103,6 @@ ARG JUPYTERHUB_VERSION
 ARG JUPYTERLAB_VERSION
 ARG CODE_BUILTIN_EXTENSIONS_DIR
 ARG CODE_SERVER_VERSION
-ARG RSTUDIO_VERSION
 ARG NEOVIM_VERSION
 ARG GIT_VERSION
 ARG GIT_LFS_VERSION
@@ -118,7 +128,6 @@ ENV PARENT_IMAGE=${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMA
     JUPYTERHUB_VERSION=${JUPYTERHUB_VERSION} \
     JUPYTERLAB_VERSION=${JUPYTERLAB_VERSION} \
     CODE_SERVER_VERSION=${CODE_SERVER_VERSION} \
-    RSTUDIO_VERSION=${RSTUDIO_VERSION} \
     NEOVIM_VERSION=${NEOVIM_VERSION} \
     GIT_VERSION=${GIT_VERSION} \
     GIT_LFS_VERSION=${GIT_LFS_VERSION} \