UNCLASSIFIED

Commit ad9ebdb8 authored by Matt Vasquez's avatar Matt Vasquez
Browse files

switch to rstudio-server binary

parent 4403ba02
Pipeline #254445 failed with stages
in 23 minutes and 51 seconds
...@@ -8,20 +8,17 @@ USER root ...@@ -8,20 +8,17 @@ USER root
ENV RSTUDIO_VERSION=1.4.1106 ENV RSTUDIO_VERSION=1.4.1106
ENV USER=rstudio
COPY rstudio-server-rhel-${RSTUDIO_VERSION}-x86_64.rpm /tmp COPY rstudio-server-rhel-${RSTUDIO_VERSION}-x86_64.rpm /tmp
RUN groupadd -g 1000 $USER && \ RUN dnf upgrade -y && \
useradd -r -u 1000 -m -g $USER $USER && \
dnf upgrade -y && \
dnf install -y --nogpgcheck glibc-langpack-en initscripts procps-ng /tmp/rstudio-server-rhel-${RSTUDIO_VERSION}-x86_64.rpm \ dnf install -y --nogpgcheck glibc-langpack-en initscripts procps-ng /tmp/rstudio-server-rhel-${RSTUDIO_VERSION}-x86_64.rpm \
binutils curl glibc-devel glibc-headers libcurl-devel libX11 libX11-common kernel-headers && \ binutils curl glibc-devel glibc-headers libcurl-devel libX11 libX11-common kernel-headers && \
rm /var/lib/rstudio-server/rstudio.sqlite && \
mkdir -p /local/libs && \ mkdir -p /local/libs && \
chown -R $USER /var/lib/rstudio-server && \ chmod -R g=u /var/lib/rstudio-server && \
chown -R $USER /etc/rstudio && \ chmod -R g=u /etc/rstudio && \
chown $USER /var/lib/rstudio-server /var/run/rstudio-server && \ chown $USER /var/lib/rstudio-server /var/run/rstudio-server && \
ln -s /usr/lib/rstudio-server/bin/rserver /usr/local/bin/rserver && \ ln -s /usr/lib/rstudio-server/bin/rstudio-server /usr/local/bin/rstudio-server && \
chmod +t /var/run/rstudio-server && \ chmod +t /var/run/rstudio-server && \
chkconfig rstudio-server off chkconfig rstudio-server off
...@@ -31,18 +28,24 @@ COPY rpackages /tmp/rpackages ...@@ -31,18 +28,24 @@ COPY rpackages /tmp/rpackages
RUN R -e "library(tools); write_PACKAGES('/local/libs')" && \ RUN R -e "library(tools); write_PACKAGES('/local/libs')" && \
cat /tmp/rpackages | awk '{printf "\x27"$1"\x27,"}' | sed 's/.$//' | xargs -0 -I {} R -e "install.packages(c({}), contriburl='file:///local/libs')" && \ cat /tmp/rpackages | awk '{printf "\x27"$1"\x27,"}' | sed 's/.$//' | xargs -0 -I {} R -e "install.packages(c({}), contriburl='file:///local/libs')" && \
rpm -e --nodeps binutils curl glibc-devel glibc-headers libcurl-devel libX11 libX11-common kernel-headers && \ rpm -e --nodeps binutils curl glibc-devel glibc-headers libcurl-devel libX11 libX11-common kernel-headers && \
echo "auth-none=1" > /etc/rstudio/disable_auth_rserver.conf && \ echo "auth-none=1" >> /etc/rstudio/disable_auth_rserver.conf && \
echo "server-daemonize=0" >> /etc/rstudio/rserver.conf && \
echo "[*]" > /etc/rstudio/logging.conf && \
echo "log-level=warn" >> /etc/rstudio/logging.conf && \
echo "logger-type=stderr" >> /etc/rstudio/logging.conf && \
dnf clean all && \ dnf clean all && \
rm -rf /var/cache/dnf /tmp/* /local/libs/* rm -rf /var/cache/dnf /tmp/* /local/libs/*
ENV LC_ALL=en_US.UTF-8 \ ENV LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \ LANG=en_US.UTF-8 \
LANGUAGE=en_US.UTF-8 LANGUAGE=en_US.UTF-8
USER ${USER} USER ${USER}
HEALTHCHECK --start-period=60s CMD rserver status HEALTHCHECK --start-period=60s CMD rstudio-server status
EXPOSE 8787 EXPOSE 8787
ENTRYPOINT ["rserver"] ENTRYPOINT ["rstudio-server", "start"]
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment