File tree Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Original file line number Diff line number Diff line change 1
1
ARG BUILD_ON_IMAGE=glcr.b-data.ch/r/base
2
2
ARG R_VERSION=4.4.2
3
+ ARG RSTUDIO_VERSION
3
4
4
5
ARG INSTALL_DEVTOOLS
5
6
ARG NODE_VERSION
@@ -43,7 +44,18 @@ RUN if [ -n "${CUDA_VERSION}" ]; then \
43
44
44
45
FROM docker.io/koalaman/shellcheck:stable as sci
45
46
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
47
59
48
60
ARG DEBIAN_FRONTEND=noninteractive
49
61
@@ -55,15 +67,13 @@ ARG NCPUS
55
67
ARG R_BINARY_PACKAGES
56
68
ARG UNMINIMIZE
57
69
ARG JUPYTERLAB_VERSION=4.3.4
58
- ARG RSTUDIO_VERSION
59
70
60
71
ARG CRAN_OVERRIDE=${CRAN}
61
72
62
73
ENV PARENT_IMAGE=${BUILD_ON_IMAGE}:${R_VERSION} \
63
74
CRAN=${CRAN_OVERRIDE:-$CRAN} \
64
75
R_BINARY_PACKAGES=${R_BINARY_PACKAGES} \
65
76
JUPYTERLAB_VERSION=${JUPYTERLAB_VERSION} \
66
- RSTUDIO_VERSION=${RSTUDIO_VERSION} \
67
77
PARENT_IMAGE_BUILD_DATE=${BUILD_DATE}
68
78
69
79
# # Unminimise if the system has been minimised
You can’t perform that action at this time.
0 commit comments