Working R v2021.09.1 Build 372 in 1.4.2 and updated tags

Author: paulkm

rstudio/Dockerfile

@@ -1,31 +1,39 @@
 ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.4.2
 FROM $BASE_CONTAINER
 
-RUN pip install jupyter-rsession-proxy nbgitpuller
+# Base notebook for 1.4.2 uses Ubuntu 20.04 (Focal)
+
+RUN pip install jupyter-rsession-proxy
 RUN conda install -y -c r r-tidyverse
 
 # install rstudio-server
-# Note: 1.4x & 1.3x have problems with proxying and auth flow, see: https://github.com/jupyterhub/jupyter-rsession-proxy/issues/97
 USER root
 
-# WAS: https://download2.rstudio.org/server/trusty/amd64/rstudio-server-1.2.5042-amd64.deb [f6d212f2fdc1e1b4e605256a91b69fed6b61c046374934d262b2c3f1e234c0d6]
-# REMOVED: curl --silent -L --fail http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb > /tmp/libssl.deb && \
-#    apt-get install -y /tmp/libssl.deb && \
-#     rm /tmp/libssl.deb && \
-
+# Per: http://cran.rstudio.com/bin/linux/ubuntu/
 RUN apt-get update && \
     apt-get install gdebi-core -y && \
-    curl --silent -L --fail https://download2.rstudio.org/server/bionic/amd64/rstudio-server-2021.09.0%2B351-amd64.deb > /tmp/rstudio.deb && \
-    echo '8ab014f050651d0b3d6d10ff0fcd6ea4873b90581f2ee1d4eaa871280685afae  /tmp/rstudio.deb' | shasum -a 256 -c - && \
+    curl --silent -L --fail https://download2.rstudio.org/server/bionic/amd64/rstudio-server-2021.09.1-372-amd64.deb > /tmp/rstudio.deb && \
+    echo 'c58df09468870b89f1796445853dce2dacaa0fc5b7bb1f92b036fa8da1d1f8a3  /tmp/rstudio.deb' | shasum -a 256 -c - && \
     apt-get install -y /tmp/rstudio.deb && \
     rm /tmp/rstudio.deb && \
     apt-get clean
 
-# These were needed in 1.4x - keeping in case proxy issues are sorted
-# RUN rm /var/lib/rstudio-server/rstudio.sqlite && \
-#    chmod -R 777 /var/lib/rstudio-server
-# ENV RSESSION_PROXY_RSTUDIO_1_4=yes
+
+# Needed in 1.4x
+RUN chmod 777 /var/lib/rstudio-server/rstudio-os.sqlite && \
+    chmod -R 777 /usr/sbin/rstudio-server
+ENV RSESSION_PROXY_RSTUDIO_1_4=yes
 
 ENV PATH=$PATH:/usr/lib/rstudio-server/bin
 
-USER $NB_USER
+USER $NB_USER
+
+RUN pip install nbgitpuller && \
+  jupyter serverextension enable nbgitpuller --sys-prefix
+
+# See: https://github.com/uw-it-aca/rttl-notebooks/pull/15
+RUN R -e "devtools::install_github('IRkernel/repr', ref = 'master')"
+RUN R -e "install.packages('IRkernel',repos='http://cran.us.r-project.org')"
+RUN R -e "IRkernel::installspec()"
+
+ENV RSESSION_PROXY_RSTUDIO_1_4=yes

rstudio/Makefile

@@ -4,10 +4,10 @@ APP_BIN?=app
 default: build
 
 DOCKER_REPO?=gcr.io/uwit-mci-axdd/rttl-rstudio-notebook
-DOCKER_TAG?=fdf878c
+DOCKER_TAG?=latest_1-4-2
 
 build:
-	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .
+	docker build -t $(DOCKER_REPO):$(DOCKER_TAG) .
 
 push: build
-	docker push $(DOCKER_REPO):latest
+	docker push $(DOCKER_REPO):$(DOCKER_TAG)