andrea.dellamico
/
docker-jenkins-integration-test
forked from gCubeSystem/docker-jenkins-integration-test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install openjdk, fix some paths.

This commit is contained in:
Andrea Dell'Amico 2022-04-02 02:45:05 +02:00
parent 0d5ca1f8d9
commit 1446410f0a
Signed by: andrea.dellamico
GPG Key ID: 147ABE6CEB9E20FF
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
06_workspace_mount.sh
View File

@ -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

6
Dockerfile
View File

@ -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