From d2db04987ea6f4d39c7bc00dfd02c716ecd64114 Mon Sep 17 00:00:00 2001
From: Adil Hafeez <adil.hafeez@gmail.com>
Date: Thu, 13 Feb 2025 15:53:05 -0800
Subject: [PATCH] Use docker cli to communicate when interact with docker
 system

---
 arch/tools/cli/core.py  |  2 +-
 arch/tools/cli/main.py  | 17 ++++++++++-------
 arch/tools/cli/utils.py | 17 -----------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/arch/tools/cli/core.py b/arch/tools/cli/core.py
index 6b252e67..dfe1f702 100644
--- a/arch/tools/cli/core.py
+++ b/arch/tools/cli/core.py
@@ -5,7 +5,7 @@ import sys
 import glob
 import docker
 from docker.errors import DockerException
-from cli.utils import getLogger, update_docker_host_env
+from cli.utils import getLogger
 from cli.consts import (
     ARCHGW_DOCKER_NAME,
     KATANEMO_LOCAL_MODEL_LIST,
diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py
index 90e8bbec..240a1b8c 100644
--- a/arch/tools/cli/main.py
+++ b/arch/tools/cli/main.py
@@ -5,13 +5,12 @@ import subprocess
 import multiprocessing
 import importlib.metadata
 from cli import targets
-from cli.docker_cli import stream_gateway_logs
+from cli.docker_cli import docker_validate_archgw_schema, stream_gateway_logs
 from cli.utils import (
     getLogger,
     get_llm_provider_access_keys,
     load_env_file_to_dict,
     stream_access_logs,
-    validate_schema,
 )
 from cli.core import (
     start_arch_modelserver,
@@ -173,11 +172,15 @@ def up(file, path, service, foreground):
 
     log.info(f"Validating {arch_config_file}")
 
-    try:
-        validate_schema(arch_config_file)
-    except Exception as e:
-        log.info(f"Exiting archgw up: validation failed")
-        log.info(f"Error: {str(e)}")
+    (
+        validation_return_code,
+        validation_stdout,
+        validation_stderr,
+    ) = docker_validate_archgw_schema(arch_config_file)
+    if validation_return_code != 0:
+        log.info(f"Error: Validation failed. Exiting")
+        log.info(f"Validation stdout: {validation_stdout}")
+        log.info(f"Validation stderr: {validation_stderr}")
         sys.exit(1)
 
     log.info("Starting arch model server and arch gateway")
diff --git a/arch/tools/cli/utils.py b/arch/tools/cli/utils.py
index 555fa206..5e82ada5 100644
--- a/arch/tools/cli/utils.py
+++ b/arch/tools/cli/utils.py
@@ -24,23 +24,6 @@ def getLogger(name="cli"):
 log = getLogger(__name__)
 
 
-def update_docker_host_env():
-    """
-    Update DOCKER_HOST environment variable to use the local Docker socket
-    """
-    if os.getenv("DOCKER_HOST"):
-        return
-
-    default_docker_socket = os.getenv("DEFAULT_DOCKER_SOCKET", "/var/run/docker.sock")
-    if not os.path.exists(default_docker_socket):
-        home_dir = os.getenv("HOME")
-        docker_host = f"unix://{home_dir}/.docker/run/docker.sock"
-        log.info(
-            f"Default docker socket {default_docker_socket} not found, using {docker_host}"
-        )
-        os.environ["DOCKER_HOST"] = docker_host
-
-
 def validate_schema(arch_config_file: str) -> None:
     try:
         try: