Skip to content

Commit 9f00986

Browse files
committed
base: Connect to RStudio via unix socket
- jupyterhub/jupyter-rsession-proxy#159
1 parent 18643cc commit 9f00986

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

base/.gitlab-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.env:
22
variables:
33
R_VERSION: "4.4.2"
4+
RSTUDIO_VERSION: "2024.12.0+467"
45
TAG_VERSION_MAJ_MIN: "false"
56
TAG_VERSION_MAJ: "false"
67

@@ -67,6 +68,7 @@ build:latest-linux-amd64:
6768
--build-arg BASE_IMAGE_TAG
6869
--build-arg BUILD_ON_IMAGE
6970
--build-arg R_VERSION
71+
--build-arg RSTUDIO_VERSION
7072
--build-arg CUDA_IMAGE_FLAVOR
7173
--build-arg CUDA_IMAGE_LICENSE
7274
--build-arg NCPUS=$((`nproc`/2+1))
@@ -114,6 +116,7 @@ build:latest-linux-arm64v8:
114116
--build-arg BASE_IMAGE_TAG
115117
--build-arg BUILD_ON_IMAGE
116118
--build-arg R_VERSION
119+
--build-arg RSTUDIO_VERSION
117120
--build-arg CUDA_IMAGE_FLAVOR
118121
--build-arg CUDA_IMAGE_LICENSE
119122
--build-arg NCPUS=$((`nproc`/2+1))

base/latest.Dockerfile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG JUPYTERHUB_VERSION=5.2.1
1010
ARG JUPYTERLAB_VERSION=4.3.4
1111
ARG CODE_BUILTIN_EXTENSIONS_DIR=/opt/code-server/lib/vscode/extensions
1212
ARG CODE_SERVER_VERSION=4.96.2
13-
ARG RSTUDIO_VERSION=2024.12.0+467
13+
ARG RSTUDIO_VERSION
1414
ARG NEOVIM_VERSION=0.10.3
1515
ARG GIT_VERSION=2.47.1
1616
ARG GIT_LFS_VERSION=3.6.0
@@ -78,7 +78,18 @@ FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi
7878
FROM glcr.b-data.ch/git/gsi/${GIT_VERSION}/${BASE_IMAGE}:${BASE_IMAGE_TAG} AS gsi
7979
FROM glcr.b-data.ch/git-lfs/glfsi:${GIT_LFS_VERSION} AS glfsi
8080

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}
8293

8394
ARG NCPUS=1
8495

@@ -92,7 +103,6 @@ ARG JUPYTERHUB_VERSION
92103
ARG JUPYTERLAB_VERSION
93104
ARG CODE_BUILTIN_EXTENSIONS_DIR
94105
ARG CODE_SERVER_VERSION
95-
ARG RSTUDIO_VERSION
96106
ARG NEOVIM_VERSION
97107
ARG GIT_VERSION
98108
ARG GIT_LFS_VERSION
@@ -118,7 +128,6 @@ ENV PARENT_IMAGE=${BUILD_ON_IMAGE}:${R_VERSION}${CUDA_IMAGE_FLAVOR:+-}${CUDA_IMA
118128
JUPYTERHUB_VERSION=${JUPYTERHUB_VERSION} \
119129
JUPYTERLAB_VERSION=${JUPYTERLAB_VERSION} \
120130
CODE_SERVER_VERSION=${CODE_SERVER_VERSION} \
121-
RSTUDIO_VERSION=${RSTUDIO_VERSION} \
122131
NEOVIM_VERSION=${NEOVIM_VERSION} \
123132
GIT_VERSION=${GIT_VERSION} \
124133
GIT_LFS_VERSION=${GIT_LFS_VERSION} \

0 commit comments

Comments
 (0)