Skip to content

Commit 1442615

Browse files
committed
R: Connect to RStudio via unix socket
- jupyterhub/jupyter-rsession-proxy#159
1 parent 143bf71 commit 1442615

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.devcontainer/R.Dockerfile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG BUILD_ON_IMAGE=glcr.b-data.ch/r/base
22
ARG R_VERSION=4.4.2
3+
ARG RSTUDIO_VERSION
34

45
ARG INSTALL_DEVTOOLS
56
ARG NODE_VERSION
@@ -43,7 +44,18 @@ RUN if [ -n "${CUDA_VERSION}" ]; then \
4344

4445
FROM docker.io/koalaman/shellcheck:stable as sci
4546

46-
FROM ${BUILD_ON_IMAGE}:${R_VERSION} as r
47+
FROM ${BUILD_ON_IMAGE}:${R_VERSION} AS base
48+
49+
FROM ${BUILD_ON_IMAGE}:${R_VERSION} AS base-rstudio
50+
51+
ARG RSTUDIO_VERSION
52+
53+
ENV RSTUDIO_VERSION=${RSTUDIO_VERSION}
54+
55+
## Connect to RStudio via unix socket
56+
ENV JUPYTER_RSESSION_PROXY_USE_SOCKET=1
57+
58+
FROM base${RSTUDIO_VERSION:+-rstudio} as r
4759

4860
ARG DEBIAN_FRONTEND=noninteractive
4961

@@ -55,15 +67,13 @@ ARG NCPUS
5567
ARG R_BINARY_PACKAGES
5668
ARG UNMINIMIZE
5769
ARG JUPYTERLAB_VERSION=4.3.4
58-
ARG RSTUDIO_VERSION
5970

6071
ARG CRAN_OVERRIDE=${CRAN}
6172

6273
ENV PARENT_IMAGE=${BUILD_ON_IMAGE}:${R_VERSION} \
6374
CRAN=${CRAN_OVERRIDE:-$CRAN} \
6475
R_BINARY_PACKAGES=${R_BINARY_PACKAGES} \
6576
JUPYTERLAB_VERSION=${JUPYTERLAB_VERSION} \
66-
RSTUDIO_VERSION=${RSTUDIO_VERSION} \
6777
PARENT_IMAGE_BUILD_DATE=${BUILD_DATE}
6878

6979
## Unminimise if the system has been minimised

0 commit comments

Comments
 (0)