Home-Assistant/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2026-02-15 07:27:13 +00:00
Code Activity

Fix getting Supervisor IP address in testing (#6564)

Browse Source 
* Fix getting Supervisor IP address in testing

Newer Docker versions (probably newer than 29.x) do not have a global
IPAddress attribute under .NetworkSettings anymore. There is a network
specific map under Networks. For our case the hassio has the relevant
IP address. This network specific maps already existed before, hence
the new inspect format works for old as well as new Docker versions.

While at it, also adjust the test fixture.

* Actively wait for hassio IPAddress to become valid
This commit is contained in:
Stefan Agner
2026-02-13 08:12:19 +01:00
committed by GitHub
parent 590674ba7c
commit 8dd42cb7a0
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/builder.yml vendored
View File

@@ -296,7 +296,11 @@ jobs:
- &wait_for_supervisor - &wait_for_supervisor
name: Wait for Supervisor to come up name: Wait for Supervisor to come up
run: | run: |
SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor) until SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.Networks.hassio.IPAddress}}' hassio_supervisor 2>/dev/null) && \
[ -n "$SUPERVISOR" ] && [ "$SUPERVISOR" != "<no value>" ]; do
echo "Waiting for network configuration..."
sleep 1
done
echo "Waiting for Supervisor API at http://${SUPERVISOR}/supervisor/ping" echo "Waiting for Supervisor API at http://${SUPERVISOR}/supervisor/ping"
timeout=300 timeout=300
elapsed=0 elapsed=0

16
tests/fixtures/container_attrs.json vendored
View File

@@ -210,28 +210,14 @@
} }
}, },
"NetworkSettings": { "NetworkSettings": {
"Bridge": "",
"SandboxID": "067cd11a63f96d227dcc0f01d3e4f5053c368021becd0b4b2da4f301cfda3d29", "SandboxID": "067cd11a63f96d227dcc0f01d3e4f5053c368021becd0b4b2da4f301cfda3d29",
"HairpinMode": false, "SandboxKey": "/var/run/docker/netns/067cd11a63f9",
"LinkLocalIPv6Address": "",
"LinkLocalIPv6PrefixLen": 0,
"Ports": { "Ports": {
"1883/tcp": [ "1883/tcp": [
{ "HostIp": "0.0.0.0", "HostPort": "1883" }, { "HostIp": "0.0.0.0", "HostPort": "1883" },
{ "HostIp": "::", "HostPort": "1883" } { "HostIp": "::", "HostPort": "1883" }
] ]
}, },
"SandboxKey": "/var/run/docker/netns/067cd11a63f9",
"SecondaryIPAddresses": null,
"SecondaryIPv6Addresses": null,
"EndpointID": "",
"Gateway": "",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
"IPAddress": "",
"IPPrefixLen": 0,
"IPv6Gateway": "",
"MacAddress": "",
"Networks": { "Networks": {
"hassio": { "hassio": {
"IPAMConfig": null, "IPAMConfig": null,