Merge branch 'main' into add-auto-remove-container-option

Author: pinzon

README.md

@@ -43,5 +43,6 @@ class TestKinesis(unittest.TestCase):
 ```
 
 ## Change Log
-* 1.0.0: Repository URL fixed
+* 1.0.2: LocalStack Pro image set as default
+* 1.0.1: Repository URL fixed
 * 1.0.0: Initial version

localstack_utils/container.py

@@ -3,8 +3,7 @@
 import docker
 from time import sleep
 
-LOCALSTACK_COMMUNITY_IMAGE_NAME = "localstack/localstack"
-LOCALSTACK_PRO_IMAGE_NAME = "localstack/localstack-pro"
+LOCALSTACK_IMAGE_NAME = "localstack/localstack-pro"
 LATEST_TAG = "latest"
 
 MAX_PORT_CONNECTION_ATTEMPTS = 10
@@ -24,25 +23,21 @@
 class Container:
     @staticmethod
     def create_localstack_container(
-        pull_new_image: bool,
-        image_name: str = None,
+        *args,
+        pull_new_image: bool = False,
+        image_name: str = LOCALSTACK_IMAGE_NAME,
         image_tag: str = LATEST_TAG,
         gateway_listen: str = "0.0.0.0:4566",
-        environment_variables: dict = None,
-        bind_ports: dict = None,
-        pro: bool = False,
         auto_remove: bool = False,
+        environment_variables: dict | None = None,
+        bind_ports: dict | None = None,
+        **kwargs,
     ):
         environment_variables = environment_variables or {}
         environment_variables["GATEWAY_LISTEN"] = gateway_listen
 
-        image_name_or_default = image_name or (
-            LOCALSTACK_PRO_IMAGE_NAME if pro else LOCALSTACK_COMMUNITY_IMAGE_NAME
-        )
         image_exists = (
-            True
-            if len(DOCKER_CLIENT.images.list(name=image_name_or_default))
-            else False
+            True if len(DOCKER_CLIENT.images.list(name=image_name)) else False
         )
 
         bind_ports = bind_ports or {}
@@ -51,10 +46,10 @@ def create_localstack_container(
 
         if pull_new_image or not image_exists:
             logging.info("Pulling latest image")
-            DOCKER_CLIENT.images.pull(image_name_or_default, image_tag)
+            DOCKER_CLIENT.images.pull(image_name, image_tag)
 
         return DOCKER_CLIENT.containers.run(
-            image_name_or_default,
+            image_name,
             ports=bind_ports,
             environment=environment_variables,
             auto_remove=auto_remove,