From b97e3b262a64d5604b6e27da1535900bdc0320f4 Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 14 Oct 2023 00:21:26 -0500 Subject: [PATCH 1/3] add windows bat and compose files --- Docker/compose-windows.bat | 2 ++ Docker/compose-windows.yml | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 Docker/compose-windows.bat create mode 100644 Docker/compose-windows.yml diff --git a/Docker/compose-windows.bat b/Docker/compose-windows.bat new file mode 100644 index 000000000..94c91fd00 --- /dev/null +++ b/Docker/compose-windows.bat @@ -0,0 +1,2 @@ +for /f "delims=[] tokens=2" %%a in ('ping -4 -n 1 %ComputerName% ^| findstr [') do set NetworkIP=%%a +docker-compose -f compose-windows.yml run -e DISPLAY=%NetworkIP%:0.0 clarke \ No newline at end of file diff --git a/Docker/compose-windows.yml b/Docker/compose-windows.yml new file mode 100644 index 000000000..89c0c339b --- /dev/null +++ b/Docker/compose-windows.yml @@ -0,0 +1,8 @@ +services: + clarke: + volumes: + - ../AUV-2024:/AUV-2024 + environment: + - QT_X11_NO_MITSHM=1 + image: "mcgillroboticsteam/auv_2024:main" + command: bash -c "tail -f /dev/null" \ No newline at end of file From d51ad2598edd58f84e790812b9210363088ea7d8 Mon Sep 17 00:00:00 2001 From: MrMondrian <57821698+MrMondrian@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:12:08 -0400 Subject: [PATCH 2/3] update submodule --- catkin_ws/src/auv-sim-gazebo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catkin_ws/src/auv-sim-gazebo b/catkin_ws/src/auv-sim-gazebo index 6a6f8397a..6d146ed3a 160000 --- a/catkin_ws/src/auv-sim-gazebo +++ b/catkin_ws/src/auv-sim-gazebo @@ -1 +1 @@ -Subproject commit 6a6f8397a3e5220c8446251290686d5125341974 +Subproject commit 6d146ed3ab278db4282bd8d688c8d9a86822f881 From a920e4bc3ce159f6c0f6b5a18d15bc2928fee035 Mon Sep 17 00:00:00 2001 From: MrMondrian <57821698+MrMondrian@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:16:08 -0400 Subject: [PATCH 3/3] fix paths issue --- Docker/compose-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/compose-windows.yml b/Docker/compose-windows.yml index 89c0c339b..bf9c4225f 100644 --- a/Docker/compose-windows.yml +++ b/Docker/compose-windows.yml @@ -1,7 +1,7 @@ services: clarke: volumes: - - ../AUV-2024:/AUV-2024 + - ../../AUV-2024:/AUV-2024 environment: - QT_X11_NO_MITSHM=1 image: "mcgillroboticsteam/auv_2024:main"