Update app to use envs for server info

This commit is contained in:
Logan Cusano
2025-04-27 00:53:18 -04:00
parent 9ade2f9249
commit 886c45261f
3 changed files with 8 additions and 9 deletions

View File

@@ -13,10 +13,5 @@ RUN pip install --no-cache-dir -r requirements.txt
# Copy the client code into the container
COPY ./app/ .
# Define environment variable for the server host
# This will be set by the Makefile when running the container
ENV SERVER_HOST=localhost
# Run client.py when the container launches
# We use a list form of CMD to properly handle signals
CMD ["python", "client.py"]

View File

@@ -11,5 +11,8 @@ build:
# Target to run the server container using the host network
run: build
docker run -it --rm \
-e CLIENT_API_URL=${SERVER_WS_URI} \
-e CLIENT_API_URL=${SERVER_API_URL} \
-e CLIENT_API_URL=${CLIENT_API_URL} \
--network=host \
$(CLIENT_IMAGE)

View File

@@ -1,15 +1,16 @@
import asyncio
import websockets
import json
import uuid # To generate a unique client ID
import uuid
import os
from drb_cdb_api import DRBCDBAPI, ConfigGenerator
from server_api import RadioAPIClient
from enum import Enum
# --- Client Configuration ---
SERVER_WS_URI = "ws://localhost:8765"
SERVER_API_URL = "http://localhost:5000"
CLIENT_API_URL = "http://localhost:8001"
SERVER_WS_URI = os.getenv("SERVER_WS_URI", "ws://localhost:8765")
SERVER_API_URL = os.getenv("SERVER_API_URL", "http://localhost:5000")
CLIENT_API_URL = os.getenv("CLIENT_API_URL", "http://localhost:8001")
# Generate or define a unique ID for THIS client instance
# In a real app, this might come from config or a login process
CLIENT_ID = f"client-{uuid.uuid4().hex[:8]}" # TODO - Implement persistent ID