From 4a29705e20e42bf90d80cdb137dcb93bc7b9b8b3 Mon Sep 17 00:00:00 2001
From: sphemakh <sphemakh@gmail.com>
Date: Sat, 9 May 2020 13:41:18 +0200
Subject: [PATCH] Fixes #603

---
 stimela/cargo/base/casa/Dockerfile           | 1 +
 stimela/cargo/cab/ragavi/parameters.json     | 2 +-
 stimela/cargo/cab/ragavi_vis/parameters.json | 2 +-
 stimela/recipe.py                            | 5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/stimela/cargo/base/casa/Dockerfile b/stimela/cargo/base/casa/Dockerfile
index 633562d2..d353a8a8 100644
--- a/stimela/cargo/base/casa/Dockerfile
+++ b/stimela/cargo/base/casa/Dockerfile
@@ -7,3 +7,4 @@ RUN chmod 755 /etc/init.d/xvfb
 RUN chmod 777 /var/run
 ENV DISPLAY :99
 RUN docker-apt-install xvfb
+RUN service dbus start
diff --git a/stimela/cargo/cab/ragavi/parameters.json b/stimela/cargo/cab/ragavi/parameters.json
index 5dda800c..590278e0 100644
--- a/stimela/cargo/cab/ragavi/parameters.json
+++ b/stimela/cargo/cab/ragavi/parameters.json
@@ -1,7 +1,7 @@
 {
     "task": "ragavi",
     "base": "stimela/ragavi",
-    "tag": "1.4.6-2",
+    "tag": "1.4.6-1",
     "description": "Radio Astronomy Gain and Visibility Inspector",
     "prefix": "--",
     "binary": "ragavi-gains",
diff --git a/stimela/cargo/cab/ragavi_vis/parameters.json b/stimela/cargo/cab/ragavi_vis/parameters.json
index c2dc351a..76970572 100644
--- a/stimela/cargo/cab/ragavi_vis/parameters.json
+++ b/stimela/cargo/cab/ragavi_vis/parameters.json
@@ -34,7 +34,7 @@
                 "scan", 
                 "time",
                 "uvdist",
-                "uvwave",
+                "uvwave"
                 ]
         },
         {
diff --git a/stimela/recipe.py b/stimela/recipe.py
index 2626631c..f7ed06be 100644
--- a/stimela/recipe.py
+++ b/stimela/recipe.py
@@ -262,8 +262,11 @@ def setup_job(self, image, config,
                 cont.add_environ("LANG", "en_US.UTF-8")
                 cont.add_environ("LC_ALL", "en_US.UTF-8")
             cont.execdir = self.workdir
+        elif self.jtype == "docker":
+            cont.add_volume("/etc/passwd", "/etc/passwd", "ro")
+            cont.add_volume("/etc/group", "/etc/group", "ro")
+            cont.RUNSCRIPT = f"/{self.jtype}_run"
         else:
-            cont.add_environ("USER", stimela.USER)
             cont.RUNSCRIPT = f"/{self.jtype}_run"
         
         runscript = shutil.which("stimela_runscript")