From 3def13fef07bff27648870b985813cc6517ab0a9 Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Thu, 15 Feb 2024 21:36:24 -0300 Subject: [PATCH 1/2] use host.docker.internal for talking to blueos --- Dockerfile | 3 +++ dvl-a50/dvl.py | 2 +- dvl-a50/dvlfinder.py | 2 +- dvl-a50/mavlink2resthelper.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ad39f7..d8b399e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,9 @@ LABEL permissions='\ },\ "HostConfig": {\ "Binds":["/root/.config:/root/.config"],\ + "ExtraHosts": [\ + "host.docker.internal:host-gateway"\ + ],\ "PortBindings": {\ "9001/tcp": [\ {\ diff --git a/dvl-a50/dvl.py b/dvl-a50/dvl.py index 80033f0..754ad37 100644 --- a/dvl-a50/dvl.py +++ b/dvl-a50/dvl.py @@ -164,7 +164,7 @@ def look_for_dvl(self): time.sleep(1) def wait_for_cable_guy(self): - while not request("http://127.0.0.1/cable-guy/v1.0/ethernet"): + while not request("http://host.docker.internal/cable-guy/v1.0/ethernet"): self.report_status("waiting for cable-guy to come online...") time.sleep(1) diff --git a/dvl-a50/dvlfinder.py b/dvl-a50/dvlfinder.py index b81564f..44d6493 100644 --- a/dvl-a50/dvlfinder.py +++ b/dvl-a50/dvlfinder.py @@ -30,7 +30,7 @@ def find_the_dvl() -> Optional[str]: nmap = nmap3.Nmap() # generate the scan mask from our current ips - networks = json.loads(request("http://127.0.0.1/cable-guy/v1.0/ethernet")) + networks = json.loads(request("http://host.docker.internal/cable-guy/v1.0/ethernet")) current_networks = [network["addresses"] for network in networks] # this looks like [{'ip': '192.168.2.2', 'mode': 'server'}] current_ips = [] diff --git a/dvl-a50/mavlink2resthelper.py b/dvl-a50/mavlink2resthelper.py index 0fb62ad..9f29166 100644 --- a/dvl-a50/mavlink2resthelper.py +++ b/dvl-a50/mavlink2resthelper.py @@ -8,7 +8,7 @@ from blueoshelper import post, request -MAVLINK2REST_URL = "http://127.0.0.1/mavlink2rest" +MAVLINK2REST_URL = "http://host.docker.internal/mavlink2rest" GPS_GLOBAL_ORIGIN_ID = 49 # holds the last status so we dont flood it From 443398dcd524277e6a957cae1658bb6127bf0c1d Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Fri, 16 Feb 2024 01:10:49 -0300 Subject: [PATCH 2/2] Make linter happy --- dvl-a50/dvl.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dvl-a50/dvl.py b/dvl-a50/dvl.py index 754ad37..9b0652e 100644 --- a/dvl-a50/dvl.py +++ b/dvl-a50/dvl.py @@ -1,6 +1,7 @@ """ Code for integration of Waterlinked DVL A50 with Companion and ArduSub """ + import json import math import os