From 5f6bc134f2332e450fc323a856bf1965c8df21e2 Mon Sep 17 00:00:00 2001
From: Di Wu <dwu20@hawk.iit.edu>
Date: Tue, 26 May 2020 15:42:41 -0500
Subject: [PATCH 1/3] feat r image using v3.6

---
 rstudio/Dockerfile | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 rstudio/Dockerfile

diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
new file mode 100644
index 00000000..c3f96ace
--- /dev/null
+++ b/rstudio/Dockerfile
@@ -0,0 +1,47 @@
+## Dockerfile for rocker/tidyverse with trial base-layer security improvements, based on Rstudio tidyverse image with additional upgrades ###
+FROM rocker/rstudio:3.6.0
+RUN apt-get update -qq && apt-get -y --no-install-recommends install \
+  libxml2-dev \
+  libcairo2-dev \
+  libsqlite3-dev \
+  libmariadbd-dev \
+  libmariadb-client-lgpl-dev \
+  unixodbc-dev \
+  libssl-dev \
+  libssh2-1-dev \
+  libpq-dev \
+  && install2.r --error \
+    --deps TRUE \
+    tidyverse \
+    dplyr \
+    devtools \
+    formatR \
+    remotes \
+    selectr \
+    caTools \
+    BiocManager
+RUN wget https://www.openssl.org/source/openssl-1.1.1a.tar.gz && \
+    tar -zxf openssl-1.1.1a.tar.gz && cd openssl-1.1.1a && \
+    ./config && \
+    apt install make gcc && \
+    make && \
+    make test && \
+    mv /usr/bin/openssl ~/tmp && \
+    make install && \
+    ln -s /usr/local/bin/openssl /usr/bin/openssl && \
+    sudo ldconfig
+RUN groupadd -r -g 1001 user && useradd -r -g user -u 1001 user
+WORKDIR /home/user
+EXPOSE 8787
+USER rstudio
+CMD ["/usr/lib/rstudio-server/bin/rserver","--server-daemonize=0","--auth-none=1"]
+
+RUN usermod -a -G users rstudio
+RUN echo '#!/usr/bin/with-contenv bash \
+          \n## load /etc/environment vars first: \
+          \n for line in $( cat /etc/environment ) ; do export $line ; done \
+          \n cp /etc/rstudio/rserver.conf /etc/rstudio/rserver.conf.bak \
+          \n cat /etc/rstudio/rserver.conf.bak | grep -v www-frame-origin > /etc/rstudio/rserver.conf \
+          \n echo www-frame-origin=${WWW_FRAME_ORIGIN} >> /etc/rstudio/rserver.conf \
+          \n exec /usr/lib/rstudio-server/bin/rserver --server-daemonize 0' \
+          > /etc/services.d/rstudio/run
\ No newline at end of file

From dce620cff5e1c9faeaa7c1a5a7f417be06c82ab3 Mon Sep 17 00:00:00 2001
From: Di Wu <dwu20@hawk.iit.edu>
Date: Tue, 26 May 2020 17:10:53 -0500
Subject: [PATCH 2/3] change cmd

---
 rstudio/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
index c3f96ace..0531fb34 100644
--- a/rstudio/Dockerfile
+++ b/rstudio/Dockerfile
@@ -33,8 +33,7 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1a.tar.gz && \
 RUN groupadd -r -g 1001 user && useradd -r -g user -u 1001 user
 WORKDIR /home/user
 EXPOSE 8787
-USER rstudio
-CMD ["/usr/lib/rstudio-server/bin/rserver","--server-daemonize=0","--auth-none=1"]
+CMD ["/init"]
 
 RUN usermod -a -G users rstudio
 RUN echo '#!/usr/bin/with-contenv bash \

From a4d09ecbc0f876e2ae7eb1baeeed535b6c2e91fb Mon Sep 17 00:00:00 2001
From: Di Wu <dwu20@hawk.iit.edu>
Date: Wed, 27 May 2020 14:38:10 -0500
Subject: [PATCH 3/3] rename repo

---
 {rstudio => rstudio3.6}/Dockerfile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {rstudio => rstudio3.6}/Dockerfile (100%)

diff --git a/rstudio/Dockerfile b/rstudio3.6/Dockerfile
similarity index 100%
rename from rstudio/Dockerfile
rename to rstudio3.6/Dockerfile