fix: retrieve MAC address from host (#1929)

Screenly · Jan 20, 2025 · c28bb7b · c28bb7b
1 parent a92c462
commit c28bb7b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/bin/upgrade_containers.sh b/bin/upgrade_containers.sh
@@ -17,6 +17,11 @@ if [[ ! "$MODE" =~ ^(pull|build)$ ]]; then
     exit 1
 fi
 
+# The `getmac` module might exit with non-zero exit code if no MAC address is found.
+set +e
+export MAC_ADDRESS=`${HOME}/installer_venv/bin/python -m getmac`
+set -e
+
 if [ -z "$DOCKER_TAG" ]; then
     export DOCKER_TAG="latest"
 fi

diff --git a/docker-compose.yml.tmpl b/docker-compose.yml.tmpl
@@ -27,6 +27,7 @@ services:
       dockerfile: docker/Dockerfile.server
     environment:
       - MY_IP=${MY_IP}
+      - MAC_ADDRESS=${MAC_ADDRESS}
       - HOST_USER=${USER}
       - HOME=/data
       - LISTEN=0.0.0.0

diff --git a/lib/utils.py b/lib/utils.py
@@ -203,7 +203,7 @@ def get_node_mac_address():
             return r.json()['mac_address']
         return 'Unknown'
 
-    return 'Unable to retrieve MAC address.'
+    return os.getenv('MAC_ADDRESS', 'Unable to retrieve MAC address.')
 
 
 def get_active_connections(bus, fields=None):

diff --git a/requirements/requirements.host.txt b/requirements/requirements.host.txt
@@ -2,6 +2,7 @@
 
 ansible-core==2.15.9
 docker==6.0.0
+getmac==0.9.4
 netifaces2==0.0.22
 redis==4.3.4
 requests[security]==2.32.3