Merge 62e8c7e into 4597772

ICRAR · Feb 24, 2022 · fdc8f69 · fdc8f69
2 parents 4597772 + 62e8c7e
commit fdc8f69
Show file tree

Hide file tree

Showing 10 changed files with 37,142 additions and 141 deletions.
diff --git a/daliuge-engine/dlg/manager/web/session.html b/daliuge-engine/dlg/manager/web/session.html
@@ -144,6 +144,7 @@
 	                 status_update_handler, 1000);
 }
 
+//breadcrumbs
 var dimUrlQuery = new URL(window.location.href);
 var dimUrl = dimUrlQuery.searchParams.get("dim_url");
 
@@ -166,8 +167,8 @@
 	const heightValue = 300;
 	const widthValue = 600;
 	// Set up zoom support
-	var svg = d3.select("svg"),
-    svgGroup = svg.append("g");
+	var svg = d3.select("svg");
+    // svgGroup = svg.append("g");
 	var inner = svg.select("g");
 
 	// svg.call(d3.zoom().on("zoom", function () {

diff --git a/daliuge-engine/dlg/prepareUser.py b/daliuge-engine/dlg/prepareUser.py
@@ -29,6 +29,7 @@
 import os
 import pwd
 import grp
+import platform
 
 def prepareUser(DLG_ROOT="."):
     workdir = f"{DLG_ROOT}/workspace/settings"
@@ -40,7 +41,11 @@ def prepareUser(DLG_ROOT="."):
     # get current user info
     pw = pwd.getpwuid(os.getuid())
     gr = grp.getgrgid(pw.pw_gid)
-    dgr = grp.getgrnam('docker')
+    if platform.system() == 'Darwin':
+        grpnam = 'staff'
+    else:
+        grpnam = 'docker'
+    dgr = grp.getgrnam(grpnam)
     with open(os.path.join(workdir, "passwd"), "wt") as file:
         file.write(open(os.path.join(template_dir, "passwd.template"), "rt").read())
         file.write(f"{pw.pw_name}:x:{pw.pw_uid}:{pw.pw_gid}:{pw.pw_gecos}:{DLG_ROOT}:/bin/bash\n")

diff --git a/daliuge-engine/run_engine.sh b/daliuge-engine/run_engine.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 DOCKER_OPTS="\
 --shm-size=1g --ipc=shareable \
 --rm \
@@ -14,7 +15,7 @@ common_prep ()
     mkdir -p ${DLG_ROOT}/testdata
     mkdir -p ${DLG_ROOT}/code
     # get current user and group id and prepare passwd and group files
-    DOCKER_GID=`python -c "from dlg.prepareUser import prepareUser; print(prepareUser(DLG_ROOT='${DLG_ROOT}'))"`
+    DOCKER_GID=`python3 -c "from dlg.prepareUser import prepareUser; print(prepareUser(DLG_ROOT='${DLG_ROOT}'))"`
     DOCKER_OPTS=${DOCKER_OPTS}" --group-add ${DOCKER_GID}"
     DOCKER_OPTS=${DOCKER_OPTS}" -v ${DLG_ROOT}/workspace/settings/passwd:/etc/passwd"
     DOCKER_OPTS=${DOCKER_OPTS}" -v ${DLG_ROOT}/workspace/settings/group:/etc/group"
@@ -30,7 +31,7 @@ case "$1" in
             echo "Please either create and grant access to $USER or build and run the development version."
         else
             VCS_TAG=`git describe --tags --abbrev=0|sed s/v//`
-            common_prep()
+            common_prep
             echo "Running Engine deployment version in background..."
             echo "docker run -td "${DOCKER_OPTS}"  icrar/daliuge-engine:${VCS_TAG}"
             docker run -td ${DOCKER_OPTS}  icrar/daliuge-engine:${VCS_TAG}