Skip to content

Commit bc9921f

Browse files
authored
⏫ Update RStudio Version (#50)
1 parent 50122a5 commit bc9921f

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

docker_template/Dockerfile

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ WORKDIR /opt/utils
3232

3333
# If installing Java environment
3434
RUN ${ARG_JDK:-false} && source /opt/utils/script-utils.sh \
35-
&& install_apt ./install_list_jdk.apt \
35+
&& VERSION_OPENJDK=16 && VERSION_OPENJDK_EA=3 \
36+
&& URL_OPENJDK="https://download.java.net/java/early_access/jdk${VERSION_OPENJDK}/${VERSION_OPENJDK_EA}/GPL/openjdk-${VERSION_OPENJDK}-ea+${VERSION_OPENJDK_EA}_linux-x64_bin.tar.gz" \
37+
&& install_tar_gz ${URL_OPENJDK} && mv /opt/jdk-* /opt/jdk \
38+
&& ln -s /opt/jdk/bin/* /usr/bin/ \
3639
&& echo "@ Version of Java (java/javac):" && java -version && javac -version \
3740
&& pip install -Uq beakerx pandas py4j \
3841
&& beakerx install \
3942
# TEMP fix: not compatible with JupyterLab 2.0
4043
# && jupyter labextension install beakerx-jupyterlab \
41-
&& jupyter labextension list \
44+
&& jupyter labextension list \
4245
|| true
4346

4447
# If installing R environment
@@ -57,17 +60,19 @@ RUN ${ARG_R:-false} && source /opt/utils/script-utils.sh \
5760
|| true \
5861
) \
5962
&& ( ${ARG_R_STUDIO:-false} \
60-
&& RSTUDIO_VERSION=$(wget --no-check-certificate -qO- https://s3.amazonaws.com/rstudio-server/current.ver) \
61-
&& RSTUDIO_VERSION=$(echo $RSTUDIO_VERSION | cut -d- -f1) \
62-
&& wget -qO- "https://download2.rstudio.org/server/bionic/amd64/rstudio-server-${RSTUDIO_VERSION}-amd64.deb" -O /tmp/rstudio.deb \
63+
&& RSTUDIO_VERSION=`wget -qO - https://dailies.rstudio.com/rstudioserver/oss/ubuntu/x86_64/ | grep -oP "(?<=rstudio-server-)[0-9]\.[0-9]\.[0-9]+" | sort | tail -n 1` \
64+
&& wget -qO- "https://s3.amazonaws.com/rstudio-ide-build/server/bionic/amd64/rstudio-server-${RSTUDIO_VERSION}-amd64.deb" -O /tmp/rstudio.deb \
6365
&& dpkg -x /tmp/rstudio.deb /tmp && mv /tmp/usr/lib/rstudio-server/ /opt/ \
66+
&& ln -s /opt/rstudio-server /usr/lib/ \
6467
&& ln -s /opt/rstudio-server/bin/rs* /usr/bin/ \
6568
# Allow RStudio server run as root user
6669
&& mkdir -p /etc/rstudio \
67-
&& echo "auth-minimum-user-id=0" >> /etc/rstudio/rserver.conf \
70+
&& echo "server-daemonize=0" >> /etc/rstudio/rserver.conf \
6871
# Configuration to make RStudio server disable authentication and do not run as daemon
72+
&& echo "server-user=root" >> /etc/rstudio/rserver.conf \
6973
&& echo "auth-none=1" >> /etc/rstudio/rserver.conf \
70-
&& echo "server-daemonize=0" >> /etc/rstudio/rserver.conf \
74+
&& echo "auth-minimum-user-id=0" >> /etc/rstudio/rserver.conf \
75+
&& echo "auth-validate-users=0" >> /etc/rstudio/rserver.conf \
7176
&& printf '#!/bin/bash\nexport USER=root\nrserver --www-port=8888' > /usr/local/bin/start-rstudio.sh \
7277
&& chmod u+x /usr/local/bin/start-rstudio.sh \
7378
# Remove RStudio's pandoc and pandoc-proc to reduce size if they are already installed in the jpy-latex step.
@@ -77,7 +82,7 @@ RUN ${ARG_R:-false} && source /opt/utils/script-utils.sh \
7782
|| true \
7883
) \
7984
&& ( ${ARG_R_STUDIO:-false} \
80-
&& RSHINY_VERSION=$(wget --no-check-certificate -qO- https://s3.amazonaws.com/rstudio-shiny-server-os-build/ubuntu-12.04/x86_64/VERSION) \
85+
&& RSHINY_VERSION=$(wget --no-check-certificate -qO- https://s3.amazonaws.com/rstudio-shiny-server-os-build/ubuntu-14.04/x86_64/VERSION) \
8186
&& wget -qO- "https://download3.rstudio.org/ubuntu-14.04/x86_64/shiny-server-${RSHINY_VERSION}-amd64.deb" -O /tmp/rshiny.deb \
8287
&& dpkg -i /tmp/rshiny.deb \
8388
&& sed -i 's/run_as shiny;/run_as root;/g' /etc/shiny-server/shiny-server.conf \

docker_template/work/install_list_jdk.apt

Lines changed: 0 additions & 4 deletions
This file was deleted.

docker_template/work/install_list_octave.apt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ libreadline-dev % GNU Readline: Command-line editing library
1616
libcurl4-gnutls-dev % cURL (~1392 KB): ftp objects, urlread/urlwrite, required when installing pckages
1717
texinfo % makeinfo (~15 MB), documentation system for on-line information and printed output, required when installing pkg
1818
zlib1g-dev % Compression library
19-
openjdk-14-jdk-headless % OpenJDK headless
2019
llvm-dev % LLVM (~239MB): required for Octave’s experimental just-in-time (JIT) compilation for speeding up the interpreter
20+
% openjdk-14-jdk-headless % OpenJDK headless
2121
% ==== Strongly recommended: Maths, Matrices, Differential / Algebraic equations, Computational Geometry
2222
libglpk-dev % GLPK (~5071 KB): solving linear programs
2323
libarpack2-dev % ARPACK (~981 KB): eigs function, solution of large-scale eigenvalue problems

0 commit comments

Comments
 (0)