Merge pull request #20 from DickPostma/main

Fix: dsbaseclient needs qmake dependency
datashield · Aug 1, 2022 · c7898f2 · c7898f2
2 parents b1dcef5 + a538bef
commit c7898f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/development/rstudio-jupyter-dev/Dockerfile b/development/rstudio-jupyter-dev/Dockerfile
@@ -1,20 +1,18 @@
-FROM jupyter/r-notebook:2022-07-18
-
+FROM jupyter/r-notebook:2022-07-27
 
 RUN python3 -m pip install jupyter-rsession-proxy
 RUN python3 -m pip install jupyter-server-proxy
 RUN jupyter labextension install @jupyterlab/server-proxy
 
 USER root
-
 # Specify RStudio version
-ENV RSTUDIO_VERSION "1.4.1717"
-# Make sure RStudio run when booting the image
-ENV RSESSION_PROXY_RSTUDIO_1_4=yes
+ENV RSTUDIO_VERSION "2022.07.1-554"
+
+
 
 # Install OS dependencies of RStudio
 RUN apt update && \
-    apt install -y libgsl0-dev zlib1g-dev libxml2-dev
+    apt install -y libgsl0-dev zlib1g-dev libxml2-dev cmake
 
 RUN curl --silent -L --fail https://download2.rstudio.org/server/bionic/amd64/rstudio-server-${RSTUDIO_VERSION}-amd64.deb > /tmp/rstudio.deb && \
     apt install -y /tmp/rstudio.deb && \
@@ -35,8 +33,8 @@ RUN ln -s /opt/conda/lib/R/library/littler/examples/installGithub.r /usr/local/b
 ENV PATH=$PATH:/usr/lib/rstudio-server/bin
 
 # Specify dependency versions
-ENV OPALR_VERSION "3.0.2"
-ENV DSI_VERSION "1.3.0"
+ENV OPALR_VERSION "3.1.0"
+ENV DSI_VERSION "1.4.0"
 ENV DSOPAL_VERSION "1.3.1"
 ENV DSMOLGENIS_ARMADILLO_VERSION "v1.4.0"
 
@@ -46,7 +44,7 @@ RUN installGithub.r "molgenis/molgenis-r-datashield@${DSMOLGENIS_ARMADILLO_VERSI
     installGithub.r "datashield/dsi@${DSI_VERSION}" && \
     installGithub.r "datashield/DSOpal@${DSOPAL_VERSION}"
 
-ENV DSBASECLIENT_BRANCH "v6.2-dev"
+ENV DSBASECLIENT_BRANCH "6.2.0"
 
 # Install DataSHIELD client
 RUN installGithub.r "datashield/dsBaseClient@${DSBASECLIENT_BRANCH}"
@@ -64,5 +62,6 @@ ENV USER ${NB_USER}
 
 USER ${NB_USER}
 
-CMD ["/usr/lib/rstudio-server/bin/rserver", "--server-user","${USER}","--server-daemonize", "0", "--auth-none", "1", "--www-frame-origin", "same", "--www-verify-user-agent", "0"]
+#CMD ["/usr/lib/rstudio-server/bin/rserver", "--server-user","${USER}","--server-daemonize", "0", "--auth-none", "1", "--www-frame-origin", "same", "--www-verify-user-agent", "0"]
+CMD /usr/lib/rstudio-server/bin/rserver --server-user ${USER} --server-daemonize 0 --auth-none 1 --www-frame-origin same --www-verify-user-agent 0
 
diff --git a/development/rstudio-jupyter-dev/package.json b/development/rstudio-jupyter-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datashield/rstudio-jupyter-dev",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "license": "LGPL-3.0",
   "description": "RStudio for JupyterHub with dsBaseClient 6.x development and dsHelper 0.0.0",
   "repository": {