Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: dsbaseclient needs qmake dependency #20

Merged
merged 1 commit into from
Aug 1, 2022
Merged

Fix: dsbaseclient needs qmake dependency #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions development/rstudio-jupyter-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -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"

Expand All @@ -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}"
Expand All @@ -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

2 changes: 1 addition & 1 deletion development/rstudio-jupyter-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down