@@ -10,7 +10,7 @@ ARG JUPYTERHUB_VERSION=5.2.1
10
10
ARG JUPYTERLAB_VERSION=4.3.4
11
11
ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
12
12
ARG CODE_SERVER_VERSION=4.96.2
13
- ARG RSTUDIO_VERSION=2024.12.0+467
13
+ ARG RSTUDIO_VERSION
14
14
ARG NEOVIM_VERSION=0.10.3
15
15
ARG GIT_VERSION=2.47.1
16
16
ARG GIT_LFS_VERSION=3.6.0
@@ -78,7 +78,18 @@ FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi
78
78
FROM glcr.b-data.ch/git/gsi/${GIT_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} AS gsi
79
79
FROM glcr.b-data.ch/git-lfs/glfsi:${GIT_LFS_VERSION} AS glfsi
80
80
81
- FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR}
81
+ FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base
82
+
83
+ FROM ${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMAGE_FLAVOR} AS base-rstudio
84
+
85
+ ARG RSTUDIO_VERSION
86
+
87
+ ENV RSTUDIO_VERSION=${RSTUDIO_VERSION}
88
+
89
+ # # Connect to RStudio via unix socket
90
+ ENV JUPYTER_RSESSION_PROXY_USE_SOCKET=1
91
+
92
+ FROM base${RSTUDIO_VERSION:+-rstudio}
82
93
83
94
ARG NCPUS=1
84
95
@@ -92,7 +103,6 @@ ARG JUPYTERHUB_VERSION
92
103
ARG JUPYTERLAB_VERSION
93
104
ARG CODE_BUILTIN_EXTENSIONS_DIR
94
105
ARG CODE_SERVER_VERSION
95
- ARG RSTUDIO_VERSION
96
106
ARG NEOVIM_VERSION
97
107
ARG GIT_VERSION
98
108
ARG GIT_LFS_VERSION
@@ -118,7 +128,6 @@ ENV PARENT_IMAGE=${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMA
118
128
JUPYTERHUB_VERSION=${JUPYTERHUB_VERSION} \
119
129
JUPYTERLAB_VERSION=${JUPYTERLAB_VERSION} \
120
130
CODE_SERVER_VERSION=${CODE_SERVER_VERSION} \
121
- RSTUDIO_VERSION=${RSTUDIO_VERSION} \
122
131
NEOVIM_VERSION=${NEOVIM_VERSION} \
123
132
GIT_VERSION=${GIT_VERSION} \
124
133
GIT_LFS_VERSION=${GIT_LFS_VERSION} \
0 commit comments