small fixes to allow running localstack with podman (localstack#5124)

naspeh · web-flow · commit 01143b7ac5d7 · 2021-12-17T13:17:05.000+01:00
diff --git a/localstack/config.py b/localstack/config.py
@@ -579,8 +579,13 @@ def in_docker():
     """
     if OVERRIDE_IN_DOCKER:
         return True
+
+    # details: https://github.com/localstack/localstack/pull/4352
     if os.path.exists("/.dockerenv"):
         return True
+    if os.path.exists("/run/.containerenv"):
+        return True
+
     if not os.path.exists("/proc/1/cgroup"):
         return False
     try:
diff --git a/localstack/services/awslambda/lambda_utils.py b/localstack/services/awslambda/lambda_utils.py
@@ -14,7 +14,7 @@
 from localstack.utils.aws import aws_stack
 from localstack.utils.aws.aws_models import LambdaFunction
 from localstack.utils.aws.aws_responses import flask_error_response_json
-from localstack.utils.common import in_docker, short_uid, to_str
+from localstack.utils.common import short_uid, to_str
 from localstack.utils.docker_utils import DOCKER_CLIENT
 
 LOG = logging.getLogger(__name__)
@@ -157,7 +157,7 @@ def get_main_endpoint_from_container():
     if not config.HOSTNAME_FROM_LAMBDA and DOCKER_MAIN_CONTAINER_IP is None:
         DOCKER_MAIN_CONTAINER_IP = False
         try:
-            if in_docker():
+            if config.is_in_docker:
                 DOCKER_MAIN_CONTAINER_IP = bootstrap.get_main_container_ip()
                 LOG.info("Determined main container target IP: %s" % DOCKER_MAIN_CONTAINER_IP)
         except Exception as e:
diff --git a/localstack/utils/docker_utils.py b/localstack/utils/docker_utils.py
@@ -882,7 +882,7 @@ def _build_run_create_cmd(
         if mount_volumes:
             cmd += [
                 volume
-                for host_path, docker_path in mount_volumes
+                for host_path, docker_path in dict(mount_volumes).items()
                 for volume in ["-v", f"{host_path}:{docker_path}"]
             ]
         if interactive:
@@ -1222,18 +1222,21 @@ def list_containers(self, filter: Union[List[str], str, None] = None, all=True)
         LOG.debug("Listing containers with filters: %s", filter)
         try:
             container_list = self.client().containers.list(filters=filter, all=all)
-            return list(
-                map(
-                    lambda container: {
-                        "id": container.id,
-                        "image": container.image,
-                        "name": container.name,
-                        "status": container.status,
-                        "labels": container.labels,
-                    },
-                    container_list,
-                )
-            )
+            result = []
+            for container in container_list:
+                try:
+                    result.append(
+                        {
+                            "id": container.id,
+                            "image": container.image,
+                            "name": container.name,
+                            "status": container.status,
+                            "labels": container.labels,
+                        }
+                    )
+                except Exception as e:
+                    LOG.error(f"Error checking container {container}: {e}")
+            return result
         except APIError:
             raise ContainerException()
 
