From 1446410f0ada593a37aacd8fba83f7c427a109ed Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Sat, 2 Apr 2022 02:45:05 +0200
Subject: [PATCH] Install openjdk, fix some paths.

---
 06_workspace_mount.sh | 1 +
 Dockerfile            | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/06_workspace_mount.sh b/06_workspace_mount.sh
index f811323..d6f00ce 100644
--- a/06_workspace_mount.sh
+++ b/06_workspace_mount.sh
@@ -25,6 +25,7 @@ decode_jwt() { _decode_base64_url $(echo -n $1 | cut -d "." -f ${2:-2}) | jq .;
 mkdir -p $workspace_dir
 chown ${USER}:${USER} $workspace_dir
 chown -R ${USER}:${USER} $workspace_logdir
+chmod 444 $workspace_fuse_jar/fuse-workspace.jar
 
 _retval=
 if [ -d /home/${USER}/workspace ]; then
diff --git a/Dockerfile b/Dockerfile
index dc1460b..06f0595 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ENV PATH=/usr/lib/rstudio-server/bin:$PATH
 RUN /rocker_scripts/install_rstudio.sh
 RUN /rocker_scripts/install_pandoc.sh
 
-RUN apt-get update && apt-get install -y fuse zip jq
+RUN apt-get update && apt-get install -y fuse zip jq openjdk-8-jdk-headless
 
 # This part comes from https://github.com/openanalytics/shinyproxy-rstudio-ide-demo/blob/master/Dockerfile
 RUN echo "www-frame-origin=same" >> /etc/rstudio/disable_auth_rserver.conf
@@ -33,9 +33,9 @@ ADD 05_setup_rsession_parameters.sh /etc/cont-init.d/05_setup_rsession_parameter
 # Prepare the workspace environment
 RUN mkdir -p /opt/workspace-lib
 RUN mkdir /var/log/workspace-lib
-ADD https://maven.d4science.org/nexus/content/repositories/gcube-snapshots/org/gcube/data-access/sh-fuse-integration/2.0.0-SNAPSHOT/sh-fuse-integration-2.0.0-20211005.090627-1-jar-with-dependencies.jar /workspace-lib/fuse-workspace.jar
+ADD https://maven.d4science.org/nexus/content/repositories/gcube-snapshots/org/gcube/data-access/sh-fuse-integration/2.0.0-SNAPSHOT/sh-fuse-integration-2.0.0-20211005.090627-1-jar-with-dependencies.jar /opt/workspace-lib/fuse-workspace.jar
 ADD 06_workspace_mount.sh /etc/cont-init.d/06_workspace_mount
-ADD 06-fuse-logback.xml /workspace-lib/logback.xml
+ADD 06-fuse-logback.xml /opt/workspace-lib/logback.xml
 
 EXPOSE 8787