fix

Author: roger-zhangg

samcli/lib/constants.py

@@ -1,5 +1,2 @@
-import os
-from samcli.cli.global_config import GlobalConfig
-
-DOCKER_MIN_API_VERSION = os.environ.get(GlobalConfig.DOCKER_API_ENV_VAR, "1.35")
+DOCKER_MIN_API_VERSION = "1.35"
 DOCKER_MIN_API_VERSION_FALLBACK = "1.44"

samcli/local/docker/container_client.py

@@ -32,6 +32,7 @@
 import docker
 from docker.utils import kwargs_from_env
 
+from samcli.cli.global_config import GlobalConfig
 from samcli.lib.constants import DOCKER_MIN_API_VERSION, DOCKER_MIN_API_VERSION_FALLBACK
 from samcli.local.docker.exceptions import ContainerArchiveImageLoadFailedException, ContainerInvalidSocketPathException
 from samcli.local.docker.platform_config import get_finch_socket_path
@@ -87,14 +88,15 @@ def __init__(self, base_url=None):
 
         # Always start with environment variables
         current_env = os.environ.copy()
+        print(current_env)
         self.client_params = kwargs_from_env(environment=current_env)
 
         # Override base_url if explicitly provided
         if base_url is not None:
             self.client_params["base_url"] = base_url
 
         # Specify minimum version
-        self.client_params["version"] = DOCKER_MIN_API_VERSION
+        self.client_params["version"] = os.environ.get(GlobalConfig.DOCKER_API_ENV_VAR, DOCKER_MIN_API_VERSION)
 
         # Initialize DockerClient with processed parameters
         LOG.debug(f"Creating container client with parameters: {self.client_params}")

tests/unit/local/docker/test_container_client.py

@@ -751,8 +751,8 @@ def test_init_with_base_url_override(self, mock_log, mock_docker_init):
         self.assertTrue(mock_log.debug.called)
 
     @patch("docker.DockerClient.__init__", return_value=None)
-    def test_init_with_base_url_override(self, mock_log, mock_docker_init):
-        """Test ContainerClient init with base_url override"""
+    def test_init_with_api_override(self, mock_docker_init):
+        """Test ContainerClient init with api override"""
         override_api = "1.51"
 
         with patch.dict("os.environ", {GlobalConfig.DOCKER_API_ENV_VAR: override_api}, clear=True):