Merge 989f33f into 3c31be0

ICRAR · May 13, 2021 · aa227dd · aa227dd
2 parents 3c31be0 + 989f33f
commit aa227dd
Show file tree

Hide file tree

Showing 52 changed files with 27,190 additions and 4,031 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,5 @@ daliuge-engine/test/apps/dynlib_example2.o
 .idea
 daliuge.iml
 *.cwl
-*.html
-*.js
 *.xml
+.DS_Store
diff --git a/daliuge-engine/start_local_managers.sh b/daliuge-engine/start_local_managers.sh
@@ -1,3 +1,4 @@
-# Script starts a data island manager on the local node. Useful mainly for testing.
+# Script starts a node manager and a data island manager on the local node. Useful mainly for testing.
 
-docker exec daliuge-engine bash -c 'source /home/ray/dlg/bin/activate && curl -sd '\''{"nodes": ["localhost"]}'\'' -H "Content-Type: application/json" -X POST http://localhost:9000/managers/dataisland'
+docker exec daliuge-engine bash -c 'dlg nm -vvd --no-dlm -H 0.0.0.0 -w /var/dlg_home/workspace'
+docker exec -ti daliuge-engine bash -c 'dlg dim -N localhost -vvd -H 0.0.0.0 -w /var/dlg_home/workspace'
diff --git a/daliuge-translator/.DS_Store b/daliuge-translator/.DS_Store
diff --git a/daliuge-translator/dlg/.DS_Store b/daliuge-translator/dlg/.DS_Store
diff --git a/daliuge-translator/dlg/dropmake/.DS_Store b/daliuge-translator/dlg/dropmake/.DS_Store
diff --git a/daliuge-translator/dlg/dropmake/web/.DS_Store b/daliuge-translator/dlg/dropmake/web/.DS_Store
diff --git a/daliuge-translator/dlg/dropmake/web/Inspector_test.css b/daliuge-translator/dlg/dropmake/web/Inspector_test.css