diff --git a/README.md b/README.md index ad6dec2492bae46722ed2edf88ad11bac5e0d5cb..b21ea99c91d20ba0f69fd2eaf73ee9cca26e6a1f 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 62f41eee62e821af3b958b3a27387e367f47723c..5ea81083e1e96a3ee01ee5166e6fc94190beb10f 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 d89b06603434dd1d6e47b53346ae0e18f3954033..8c64aa2ba0a711479f3a59f65b25c27b287c81ac 160000 --- a/coordinator +++ b/coordinator @@ -1 +1 @@ -Subproject commit d89b06603434dd1d6e47b53346ae0e18f3954033 +Subproject commit 8c64aa2ba0a711479f3a59f65b25c27b287c81ac diff --git a/docker-compose.yml b/docker-compose.yml index 1b994ce2c04cb243cd9ec3b359f9171d064bc417..42d51ed20b51c46448dd78841c7001ea1502ef16 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 10b0ba80f94223e2a3ca55d6362f9b5ec57928ca..67d2b5ba35f383ab2ea9ec15a271c203533899f4 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 aea32b90b5ce5c0511d5244e4e6d8c0f18c4a406..372ec585bef99589280c5f571ba39100b7b3b2ec 160000 --- a/web-ros3rag +++ b/web-ros3rag @@ -1 +1 @@ -Subproject commit aea32b90b5ce5c0511d5244e4e6d8c0f18c4a406 +Subproject commit 372ec585bef99589280c5f571ba39100b7b3b2ec