Merge pull request #607 from ratt-ru/issue-603

Issue 603
ratt-ru · May 9, 2020 · a0af56a · a0af56a
2 parents ae480a5 + d810be1
commit a0af56a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -34,7 +34,7 @@
                 "scan", 
                 "time",
                 "uvdist",
-                "uvwave",
+                "uvwave"
                 ]
         },
         {

diff --git 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")