adds container cleanup before starting and after closing (ITISFoundation#3153)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/containers.py

@@ -30,7 +30,11 @@
 from ..core.docker_utils import docker_client
 from ..core.rabbitmq import RabbitMQ
 from ..core.settings import DynamicSidecarSettings
-from ..core.shared_handlers import remove_the_compose_spec, write_file_and_run_command
+from ..core.shared_handlers import (
+    cleanup_containers_and_volumes,
+    remove_the_compose_spec,
+    write_file_and_run_command,
+)
 from ..core.utils import assemble_container_names
 from ..core.validation import (
     InvalidComposeSpec,
@@ -61,11 +65,14 @@ async def _task_docker_compose_up(
 ) -> None:
     # building is a security risk hence is disabled via "--no-build" parameter
     await send_message(rabbitmq, "starting service containers")
-    command = (
-        "docker-compose --project-name {project} --file {file_path} "
-        "up --no-build --detach"
-    )
+
     with directory_watcher_disabled(app):
+        await cleanup_containers_and_volumes(shared_store, settings)
+
+        command = (
+            "docker-compose --project-name {project} --file {file_path} "
+            "up --no-build --detach"
+        )
         finished_without_errors, stdout = await write_file_and_run_command(
             settings=settings,
             file_content=shared_store.compose_spec,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/shared_handlers.py

@@ -10,6 +10,24 @@
 logger = logging.getLogger(__name__)
 
 
+async def cleanup_containers_and_volumes(
+    shared_store: SharedStore, settings: DynamicSidecarSettings
+) -> None:
+    cleanup_command = (
+        "docker-compose --project-name {project} --file {file_path} rm --force -v"
+    )
+    finished_without_errors, stdout = await write_file_and_run_command(
+        settings=settings,
+        file_content=shared_store.compose_spec,
+        command=cleanup_command,
+        command_timeout=None,
+    )
+    if not finished_without_errors:
+        logger.warning(
+            "Unexpected error while running command\n%s:\n%s", cleanup_command, stdout
+        )
+
+
 async def write_file_and_run_command(
     settings: DynamicSidecarSettings,
     file_content: Optional[str],
@@ -37,6 +55,8 @@ async def remove_the_compose_spec(
     if stored_compose_content is None:
         return True, "No started spec to remove was found"
 
+    await cleanup_containers_and_volumes(shared_store, settings)
+
     command = (
         "docker-compose -p {project} -f {file_path} "
         "down --volumes --remove-orphans -t {stop_and_remove_timeout}"