Several changes to support AWS ECS and fix the test graphs

ICRAR · Sep 25, 2020 · bd5f5dc · bd5f5dc
1 parent 797cb2c
commit bd5f5dc
Show file tree

Hide file tree

Showing 7 changed files with 2,214 additions and 2,449 deletions.
diff --git a/daliuge-common/dlg/common/__init__.py b/daliuge-common/dlg/common/__init__.py
@@ -46,7 +46,7 @@ class Categories:
     VARIABLES = 'Variables'
 
     DATA = 'Data'
-    COMPONENT = 'Component'
+    COMPONENT = 'PythonApp'
     BASH_SHELL_APP = 'BashShellApp'
     MPI = 'Mpi'
     DYNLIB_APP = 'DynlibApp'

diff --git a/daliuge-engine/README.md b/daliuge-engine/README.md
@@ -49,20 +49,20 @@ Starting node manager:
 docker exec -ti daliuge-engine dlg nm -v --no-dlm -H 0.0.0.0
 ```
 
-Starting master manager:
+Starting Data Island Manager:
 
 ```bash
-docker exec -ti daliuge-engine dlg mm -v -H 0.0.0.0
+docker exec -ti daliuge-engine dlg dim -N localhost -v -H 0.0.0.0
 ```
 
 ### Using RESTful commands
 
 It is also possible to use the RESTful interface to start the managers. This requires the usage of either curl or wget, since the API requires POST commands (using a browser is not easily possible). Note that if the containers had been deployed on multiple hosts, the commands below will need to be adjusted to reflect the actual hostname, rather than localhost.
 
-Starting the master manager:
+Starting the island manager:
 
 ```bash
-curl -X POST http://localhost:9000/managers/master
+curl -d '{"nodes": ["localhost"]}' -H "Content-Type: application/json" -X POST http://localhost:9000/managers/dataisland
 ```
 
 Starting the node manager:
@@ -71,10 +71,10 @@ Starting the node manager:
 curl -X POST http://localhost:9000/managers/node
 ```
 
-Optional: Starting the island manager:
+Optional: Starting the master manager:
 
 ```bash
-curl -d '{"nodes": ["0.0.0.0"]}' -H "Content-Type: application/json" -X POST http://localhost:9000/managers/dataisland
+curl -X POST http://localhost:9000/managers/master
 ```
 
 ## Accessing the run-time web interface

diff --git a/daliuge-engine/docker/Dockerfile b/daliuge-engine/docker/Dockerfile
@@ -13,7 +13,12 @@ COPY --from=0 /usr/local/lib/python3.8/site-packages/. /usr/local/lib/python3.8/
 COPY --from=0 /usr/local/bin/. /usr/local/bin/.
 COPY --from=0 /daliuge/. /daliuge/.
 
+EXPOSE 5555
+EXPOSE 6666
 EXPOSE 8000
+EXPOSE 8001
+EXPOSE 8002
 EXPOSE 9000
 
+
 CMD ["dlg", "daemon", "-vv", "--no-nm"]
diff --git a/daliuge-engine/run_engine.sh b/daliuge-engine/run_engine.sh
@@ -1 +1 @@
-docker run --rm -ti --name daliuge-engine -p 8000:8000 -p 8001:8001 -p 8002:8002 -p 9000:9000  icrar/daliuge-engine:latest
+docker run --rm -td --name daliuge-engine -p 5555:5555 -p 6666:6666 -p 8000:8000 -p 8001:8001 -p 8002:8002 -p 9000:9000  icrar/daliuge-engine:latest