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 rstudio proxy #80

Merged
merged 12 commits into from
Oct 17, 2023
Merged

Fix rstudio proxy #80

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
19094c5
update rstudio version
RockfordMankiniUCSD Oct 11, 2023
a964fb7
try a new key
RockfordMankiniUCSD Oct 11, 2023
f5b62fb
key with capital in it
RockfordMankiniUCSD Oct 11, 2023
e01800b
try older server proxy
RockfordMankiniUCSD Oct 11, 2023
1083c27
try with more up to date instructions
RockfordMankiniUCSD Oct 11, 2023
386e258
coerece jupyter-rsession-proxy
RockfordMankiniUCSD Oct 12, 2023
6645f8e
add -n to gdebi
RockfordMankiniUCSD Oct 12, 2023
a8fb6ac
for sake of testing remove other notebooks
RockfordMankiniUCSD Oct 12, 2023
5973879
add ds back
RockfordMankiniUCSD Oct 12, 2023
7ec52b6
remove sqlite bit
RockfordMankiniUCSD Oct 12, 2023
8b1148f
final test
RockfordMankiniUCSD Oct 12, 2023
4cf8460
update rmarkdown
RockfordMankiniUCSD Oct 12, 2023
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
13 changes: 5 additions & 8 deletions images/rstudio-notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,19 @@ FROM ghcr.io/ucsd-ets/datascience-notebook:${BASE_TAG}
USER root

# Follow instructions atL https://www.rstudio.com/products/rstudio/download-server/
ENV RSTUDIO_PKG=rstudio-server-1.4.1717-amd64.deb \
RSESSION_PROXY_RSTUDIO_1_4=true
ENV RSTUDIO_URL=https://download2.rstudio.org/server/bionic/amd64/${RSTUDIO_PKG}
ENV RSTUDIO_PKG=rstudio-server-2023.09.0-463-amd64.deb
ENV RSTUDIO_URL=https://download2.rstudio.org/server/focal/amd64/${RSTUDIO_PKG}

# rstudio installation expects R to live under /usr/bin, /bin/, etc.
RUN ln -s /opt/conda/bin/R /usr/bin/R && \
gpg --keyserver keyserver.ubuntu.com --recv-key E331692F && \
apt-get update && \
apt-get -qq install -y apt-utils gdebi-core dpkg-sig && \
curl -L ${RSTUDIO_URL} > ${RSTUDIO_PKG} && \
dpkg-sig --verify ${RSTUDIO_PKG} && \
wget ${RSTUDIO_URL} && \
gdebi -n ${RSTUDIO_PKG} && \
rm -f ${RSTUDIO_PKG} && \
echo '/opt/conda/lib/R/lib' > /etc/ld.so.conf.d/r.conf && /sbin/ldconfig -v && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
rm -f /usr/bin/R && \
rm /var/lib/rstudio-server/rstudio.sqlite && \
chmod -R g=u /var/lib/rstudio-server

# Revert to 1.0b6 to correct terminal bug (see https://github.com/jupyterhub/jupyter-rsession-proxy/issues/71)
Expand All @@ -45,7 +41,8 @@ ENV PATH="${PATH}:/usr/lib/rstudio-server/bin" \
COPY ./lib /opt/k8s-support/lib

RUN R -e "install.packages('rjson', repos='http://cran.rstudio.com/')" && \
R -e "install.packages('session', repos='http://cran.rstudio.com/')"
R -e "install.packages('session', repos='http://cran.rstudio.com/')" && \
R -e "install.packages('rmarkdown', repos='http://cran.rstudio.com/')"

COPY ./test ./integration_tests /home/jovyan/
#/usr/share/datahub/tests/datascience-rstudio-docker
Expand Down