diff --git a/.env b/.env index c305f0e..4ad2e59 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ STUDIO_HTTP_PORT=8080 STUDIO_HTTPS_PORT=8083 STUDIO_DB_PACKAGES= STUDIO_APP_PACKAGES="movai-launcher=2.2.2-2,movai-ide-ce=3.0.0-7" -STUDIO_SPAWNER_PACKAGES="flow-initiator=1.0.1.9,ros-noetic-movai-ce-demos=1.0.0-8,ros-noetic-movai-ports-and-messages-ce=1.0.0-1" +STUDIO_SPAWNER_PACKAGES="flow-initiator=1.0.1.9,ros-noetic-movai-ce-demos=1.0.0-12,ros-noetic-movai-ports-and-messages-ce=1.0.0-1" STUDIO_SIMU_PLUGIN_PACKAGES="movai-ign-plugin-world-launcher=1.0.1-4" STUDIO_SIMU_GUI="WorldLauncher" MOVAI_DEVICE_NAME=robot1 diff --git a/.github/workflows/TestOnPR.yml b/.github/workflows/TestOnPR.yml index 3df1c04..55d13c5 100644 --- a/.github/workflows/TestOnPR.yml +++ b/.github/workflows/TestOnPR.yml @@ -65,7 +65,7 @@ jobs: sudo chown 1000:1000 ./{logs,shared,userspace,models_database} -R - name: run docker-compose cluster - uses: isbang/compose-action@v1.2.0 + uses: isbang/compose-action@v1.3.2 with: compose-file: './docker-compose.yml' down-flags: '--volumes' diff --git a/README.md b/README.md index c1f6568..078b93c 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,17 @@ curl -s https://api.github.com/repos/MOV-AI/movai-flow/releases/latest | grep "b sudo apt install ./movai-flow-1.2.0*.deb ``` +## Update +Follow our [documentation](https://flow.mov.ai/docs/updating-movai-flow) page for steps and details on how to update MOV.AI Flow. + +--- + ## Usage +You can find an overview of icons and CLI for launching the installed software. Follow our [readme page](https://flow.mov.ai/docs/launching-movai-1) for a detailed explanation. + +### Modes of operation: host vs isolated network +MOV.AI Flow™ Can run between two modes at a given time. The host mode and the isolated mode. Please find the details of both in our [documentation website](https://flow.mov.ai/docs/running-modes-host-vs-isolated-network). + ### Desktop shortcuts Installing the Flow package will provide a few application shortcuts in the programming section: diff --git a/debian/changelog b/debian/changelog index 6eb7e9d..6c7a912 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -movai-flow (1.3.0-1) UNRELEASED; urgency=medium +movai-flow (3.0.1-0) UNRELEASED; urgency=medium + [ mithun ] + * update docs and demos pacakges + [ Alex Fernandes ] * add host_mode feature diff --git a/haproxy/503-movai.html b/haproxy/503-movai.html index 5a5a8c3..ff24db9 100644 --- a/haproxy/503-movai.html +++ b/haproxy/503-movai.html @@ -21,7 +21,7 @@

This page is refreshed every 5 seconds. If it is taking too long, please che
-
docker-compose logs /usr/share/movai-flow/docker-compose.yml
+
docker-compose -f /usr/share/movai-flow/docker-compose.yml logs -f
diff --git a/haproxy/503-movai.http b/haproxy/503-movai.http index c11c4e7..b05f44f 100644 --- a/haproxy/503-movai.http +++ b/haproxy/503-movai.http @@ -22,7 +22,7 @@ Content-Type: text/html
-
docker-compose -f /usr/share/movai-flow/docker-compose.yml logs 
+
docker-compose -f /usr/share/movai-flow/docker-compose.yml logs -f
diff --git a/scripts/movai-flow-launch b/scripts/movai-flow-launch index e03b0f1..8a38d62 100755 --- a/scripts/movai-flow-launch +++ b/scripts/movai-flow-launch @@ -55,12 +55,14 @@ if [ "$NETWORK_MODE" = "" ]; then MOV.AI Flow™ can either run in an isolated docker network or use the host's networking interfaces - isolated network is recommended when working with a single host - - host network is recommended when working with multiple hosts (RPi, sensors, ...) which will need to access MOV.AI Flow™ containers - When selecting host network, the host's networking interface to be used as ROS_IP will be asked. + - host network is recommended when working with multiple hosts (RPi, sensors, ...), + which will need to access MOV.AI Flow™ containers. In the host mode we will use the host networking interface. + The script will auto-detect and promt to confirm. The value is set as the ROS_IP env variable. If you don't know what this is all about just press ENTER --- + See https://flow.mov.ai/docs/running-modes-host-vs-isolated-network See docker doc: https://docs.docker.com/network/host/. See ROS doc: http://wiki.ros.org/ROS/EnvironmentVariables#ROS_IP.2FROS_HOSTNAME. "