@@ -32,13 +32,16 @@ WORKDIR /opt/utils
32
32
33
33
# If installing Java environment
34
34
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/ \
36
39
&& echo "@ Version of Java (java/javac):" && java -version && javac -version \
37
40
&& pip install -Uq beakerx pandas py4j \
38
41
&& beakerx install \
39
42
# TEMP fix: not compatible with JupyterLab 2.0
40
43
# && jupyter labextension install beakerx-jupyterlab \
41
- && jupyter labextension list \
44
+ && jupyter labextension list \
42
45
|| true
43
46
44
47
# If installing R environment
@@ -57,17 +60,19 @@ RUN ${ARG_R:-false} && source /opt/utils/script-utils.sh \
57
60
|| true \
58
61
) \
59
62
&& ( ${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 \
63
65
&& dpkg -x /tmp/rstudio.deb /tmp && mv /tmp/usr/lib/rstudio-server/ /opt/ \
66
+ && ln -s /opt/rstudio-server /usr/lib/ \
64
67
&& ln -s /opt/rstudio-server/bin/rs* /usr/bin/ \
65
68
# Allow RStudio server run as root user
66
69
&& mkdir -p /etc/rstudio \
67
- && echo "auth-minimum-user-id =0" >> /etc/rstudio/rserver.conf \
70
+ && echo "server-daemonize =0" >> /etc/rstudio/rserver.conf \
68
71
# Configuration to make RStudio server disable authentication and do not run as daemon
72
+ && echo "server-user=root" >> /etc/rstudio/rserver.conf \
69
73
&& 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 \
71
76
&& printf '#!/bin/bash\n export USER=root\n rserver --www-port=8888' > /usr/local/bin/start-rstudio.sh \
72
77
&& chmod u+x /usr/local/bin/start-rstudio.sh \
73
78
# 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 \
77
82
|| true \
78
83
) \
79
84
&& ( ${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) \
81
86
&& wget -qO- "https://download3.rstudio.org/ubuntu-14.04/x86_64/shiny-server-${RSHINY_VERSION}-amd64.deb" -O /tmp/rshiny.deb \
82
87
&& dpkg -i /tmp/rshiny.deb \
83
88
&& sed -i 's/run_as shiny;/run_as root;/g' /etc/shiny-server/shiny-server.conf \
0 commit comments