From ad9ebdb8013c1cfcbefb9402cb050919ede90409 Mon Sep 17 00:00:00 2001
From: "matt.vasquez" <Vasquez_Matt@bah.com>
Date: Sat, 8 May 2021 18:48:07 -0500
Subject: [PATCH] switch to rstudio-server binary

---
 Dockerfile | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 55c432e..2bcb45a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,20 +8,17 @@ USER root
 
 ENV RSTUDIO_VERSION=1.4.1106
 
-ENV USER=rstudio
-
 COPY rstudio-server-rhel-${RSTUDIO_VERSION}-x86_64.rpm /tmp
 
-RUN groupadd -g 1000 $USER && \
-    useradd -r -u 1000 -m -g $USER $USER && \
-    dnf upgrade -y && \
+RUN dnf upgrade -y && \
     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 && \
+    rm /var/lib/rstudio-server/rstudio.sqlite && \
     mkdir -p /local/libs && \
-    chown -R $USER /var/lib/rstudio-server && \
-    chown -R $USER /etc/rstudio && \
+    chmod -R g=u /var/lib/rstudio-server && \
+    chmod -R g=u /etc/rstudio && \
     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 && \
     chkconfig rstudio-server off
 
@@ -31,18 +28,24 @@ COPY rpackages /tmp/rpackages
 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')" && \
     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 && \
     rm -rf /var/cache/dnf /tmp/* /local/libs/*
 
+
+
 ENV LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8
 
 USER ${USER}
 
-HEALTHCHECK --start-period=60s CMD rserver status
+HEALTHCHECK --start-period=60s CMD rstudio-server status
 
 EXPOSE 8787
 
-ENTRYPOINT ["rserver"]
\ No newline at end of file
+ENTRYPOINT ["rstudio-server", "start"]
\ No newline at end of file
-- 
GitLab