strip off warning messages when extracting Docker container ID from stdout

whummer · whummer · commit 1b853fbf98c5 · 2021-07-16T22:50:09.000+02:00
diff --git a/localstack/services/awslambda/lambda_executors.py b/localstack/services/awslambda/lambda_executors.py
@@ -602,7 +602,7 @@ def create_container(self, func_details, env_vars, lambda_cwd):
             env_vars["HOSTNAME"] = os.environ.get("HOSTNAME")
         env_vars["EDGE_PORT"] = config.EDGE_PORT
 
-        DOCKER_CLIENT.create_container(
+        return DOCKER_CLIENT.create_container(
             image_name=docker_image,
             remove=True,
             interactive=True,
diff --git a/localstack/utils/docker.py b/localstack/utils/docker.py
@@ -249,6 +249,8 @@ def create_container(self, image_name: str, **kwargs) -> str:
         LOG.debug("Create container with cmd: %s", cmd)
         try:
             container_id = safe_run(cmd)
+            # Note: strip off Docker warning messages like "DNS setting (--dns=127.0.0.1) may fail in containers"
+            container_id = container_id.strip().split("\n")[-1]
             return container_id.strip()
         except subprocess.CalledProcessError as e:
             if "Unable to find image" in e.stdout.decode(config.DEFAULT_ENCODING):
