From 6298a6e7cb0e7f069f696816729477cd7ea8c023 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Wed, 17 Aug 2022 16:34:35 +0200
Subject: [PATCH] update based on reviewer comments

---
 README.md                   |  6 +++---
 config/config-b-docker.yaml |  2 +-
 coordinator                 |  2 +-
 docker-compose.yml          | 14 +++++++++-----
 links.md                    |  8 +++++---
 web-ros3rag                 |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ad6dec2..b21ea99 100644
--- a/README.md
+++ b/README.md
@@ -136,12 +136,12 @@ There are some possible sources of errors.
 
 (1) The RAG application fails to write the SVG.
 This would be visible as a Java exception in the log output of `docker-compose up rag_place_b`.
-The directory `/ros3rag/ros3rag.placeB/images` has to exist in the container and must be writeable.
-Fixing this is not easy, a possibility is to create a new Dockerfile based on `models2022_rag_place` and add `RUN mkdir /ros3rag/ros3rag.placeB/images` to create this directory manually there.
+The directory `/ros3rag/images` has to exist in the container and must be writeable.
+Fixing this is not easy, a possibility is to attach to the running container of `rag_place_b` and make sure, that the directory `/ros3rag/images` is writeable.
 
 (2) The SVG was written but is not readable for the web UI.
 Everytime an SVG is received, its original and rewritten path is logged for the container of `docker-compose up web`.
-As an alternative, you can manually view these images, since they reside on your host machine in the directory `shared_directory_images`.
+As an alternative, you can manually view these images, since they reside on your host machine in the volume `shared_images`.
 
 ### Error: build path [...] either does not exist, is not accessible, or is not a valid URL
 
diff --git a/config/config-b-docker.yaml b/config/config-b-docker.yaml
index 62f41ee..5ea8108 100644
--- a/config/config-b-docker.yaml
+++ b/config/config-b-docker.yaml
@@ -1,4 +1,4 @@
-mqttHost: "localhost"
+mqttHost: "mosquitto"
 filenameRegions: "src/main/resources/regions-b-placeworld.json"
 forB:
   topicsSceneUpdate:
diff --git a/coordinator b/coordinator
index d89b066..8c64aa2 160000
--- a/coordinator
+++ b/coordinator
@@ -1 +1 @@
-Subproject commit d89b06603434dd1d6e47b53346ae0e18f3954033
+Subproject commit 8c64aa2ba0a711479f3a59f65b25c27b287c81ac
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b994ce..42d51ed 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: models2022_ros_place:latest
     build:
       context: robotic-controller
-      dockerfile: Dockerfile-vnc-foo
+      dockerfile: Dockerfile-vnc
     volumes:
       - "./ros_place_b1_logs/:/home/root/.ros/log"
     ports:
@@ -36,14 +36,16 @@ services:
       - "TARGET=ros3rag.placeB"
       - "CONFIG_FILE=/ros3rag/config-b-docker.yaml"
     volumes:
-      - "./shared_directory_images:/ros3rag/images"
+      - "shared_images:/ros3rag/images:rw"
       - "./config/config-b-docker.yaml:/ros3rag/config-b-docker.yaml"
 
   coordinator:
     image: models2022_coordinator:latest
     build: coordinator
-    environment:
-      - "CONFIG_FILE=/coordinator/ros3rag.coordinator"
+    command:  # will be parameters to entrypoint
+      - "--dry-run"
+      - "--mqtt-host=mosquitto"
+      - "/ros3rag.coordinator"
     volumes:
       - "./config/ros3rag.coordinator:/ros3rag.coordinator"
 
@@ -51,7 +53,7 @@ services:
     image: models2022_web:latest
     build: web-ros3rag
     volumes:
-      - "./shared_directory_images:/shared_directory_images"
+      - "shared_images:/shared_directory_images:ro"
       - "./config/web-config.yaml:/app/config.yaml"
     ports:
       - "8050:8050"
@@ -64,3 +66,5 @@ services:
     restart: unless-stopped
     volumes:
       - ./config/mosquitto.conf:/mosquitto/config/mosquitto.conf
+volumes:
+  shared_images:
diff --git a/links.md b/links.md
index 10b0ba8..67d2b5b 100644
--- a/links.md
+++ b/links.md
@@ -14,14 +14,16 @@ Documentation: <https://jastadd.pages.st.inf.tu-dresden.de/ragconnect-minimal>
 
 Repositories
 - RAG part: <https://git-st.inf.tu-dresden.de/jastadd/ros3rag>
-- ROS parts: <https://git-st.inf.tu-dresden.de/ceti/ros/ccf>
+- ROS part: <https://git-st.inf.tu-dresden.de/ceti/ros/ccf>
+- Web UI: <https://git-st.inf.tu-dresden.de/jastadd/web-ros3rag>
+- Coordinator: <https://git-st.inf.tu-dresden.de/jastadd/coordinator>
 - Complete workspace: <https://git-st.inf.tu-dresden.de/ceti/ros/models2022>
 
 # Other Used Tools
 
-Visualization of Grammar: <https://jastadd.pages.st.inf.tu-dresden.de/grammar2uml/>
+Visualization of Grammars: <https://jastadd.pages.st.inf.tu-dresden.de/grammar2uml/>
 
-Visualization of AST: <https://jastadd.pages.st.inf.tu-dresden.de/relast2uml/>
+Visualization of ASTs: <https://jastadd.pages.st.inf.tu-dresden.de/relast2uml/>
 
 RelAST: <https://jastadd.pages.st.inf.tu-dresden.de/relational-rags/>
 
diff --git a/web-ros3rag b/web-ros3rag
index aea32b9..372ec58 160000
--- a/web-ros3rag
+++ b/web-ros3rag
@@ -1 +1 @@
-Subproject commit aea32b90b5ce5c0511d5244e4e6d8c0f18c4a406
+Subproject commit 372ec585bef99589280c5f571ba39100b7b3b2ec
-- 
GitLab