remove cleanup-homes, workdir stuff

nesi · Feb 19, 2024 · 22cee47 · 22cee47
1 parent f0bcf0f
commit 22cee47
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -35,5 +35,3 @@ RUN git clone https://github.com/chrisdjscott/ood-k8s-utils.git /opt/ood-k8s-uti
 
 RUN echo "#!/bin/bash" > /bin/module \
     && chmod +x /bin/module
-
-COPY cleanup-homes /usr/local/bin/
diff --git a/docker/cleanup-homes b/docker/cleanup-homes
diff --git a/submit.yml.erb b/submit.yml.erb
@@ -13,8 +13,7 @@ script:
   native:
     container:
       name: "rstudio"
-      image: "ghcr.io/nesi/training-environment-rstudio-app:main"
-      image_pull_policy: "Always"
+      image: "ghcr.io/nesi/training-environment-rstudio-app:v0.1.0"
       command: ["/bin/bash","-l","<%= staged_root %>/job_script_content.sh"]
       restart_policy: 'OnFailure'
       env:

diff --git a/template/script.sh.erb b/template/script.sh.erb
@@ -29,17 +29,14 @@ sed 's/^ \{2\}//' > "$WORKING_DIR/rsession.sh" << EOL
   # Launch the original command
   echo "Launching rsession..."
   set -x
-  exec rsession --session-default-working-dir=~/rstudio-work --session-default-new-project-dir=~/rstudio-projects "\${@}"
+  exec rsession "\${@}"
 EOL
 )
 chmod 700 "$WORKING_DIR/rsession.sh"
 mkdir -p "$WORKING_DIR/logs"
 mkdir -p /tmp/rserver-run
-mkdir -p ~/rstudio-work
-mkdir -p ~/rstudio-projects
 
-# change to home directory
-cd ~/rstudio-work
+cd $HOME
 
 set -x
 # Launch the RStudio Server
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,5 +35,3 @@ RUN git clone https://github.com/chrisdjscott/ood-k8s-utils.git /opt/ood-k8s-uti

		RUN echo "#!/bin/bash" > /bin/module \
		&& chmod +x /bin/module

		COPY cleanup-homes /usr/local/bin/