Switch to new version of docker compose

Author: badrogger

node_cli/core/checks.py

@@ -415,26 +415,26 @@ def docker_api(self) -> CheckResult:
 
     @preinstall
     def docker_compose(self) -> CheckResult:
-        name = 'docker-compose'
-        cmd = shutil.which('docker-compose')
+        name = 'docker'
+        cmd = shutil.which('docker')
         if cmd is None:
-            info = 'No such command: "docker-compose"'
+            info = 'No such command: "docker"'
             return self._failed(name=name, info=info)
 
         v_cmd_result = run_cmd(
-            ['docker-compose', '-v'],
+            ['docker compose', 'version'],
             check_code=False,
             separate_stderr=True
         )
         output = v_cmd_result.stdout.decode('utf-8').rstrip()
         if v_cmd_result.returncode != 0:
-            info = f'Checking docker-compose version failed with: {output}'
+            info = f'Checking docker compose version failed with: {output}'
             return self._failed(name=name, info=output)
 
         actual_version = output.split(',')[0].split()[-1].strip()
         expected_version = self.requirements['docker-compose']
 
-        info = f'Expected docker-compose version {expected_version}, actual {actual_version}'  # noqa
+        info = f'Expected docker compose version {expected_version}, actual {actual_version}'  # noqa
         if version_parse(actual_version) < version_parse(expected_version):
             return self._failed(name=name, info=info)
         else:

node_cli/utils/docker_utils.py

@@ -247,7 +247,7 @@ def compose_rm(env={}, sync_node: bool = False):
     compose_path = get_compose_path(sync_node)
     run_cmd(
         cmd=(
-            'docker-compose',
+            'docker compose',
             '-f', compose_path,
             'down',
             '-t', str(COMPOSE_SHUTDOWN_TIMEOUT),
@@ -261,7 +261,7 @@ def compose_pull(sync_node: bool = False):
     logger.info('Pulling compose containers')
     compose_path = get_compose_path(sync_node)
     run_cmd(
-        cmd=('docker-compose', '-f', compose_path, 'pull'),
+        cmd=('docker compose', '-f', compose_path, 'pull'),
         env={
             'SKALE_DIR': SKALE_DIR
         }
@@ -272,19 +272,19 @@ def compose_build(sync_node: bool = False):
     logger.info('Building compose containers')
     compose_path = get_compose_path(sync_node)
     run_cmd(
-        cmd=('docker-compose', '-f', compose_path, 'build'),
+        cmd=('docker compose', '-f', compose_path, 'build'),
         env={
             'SKALE_DIR': SKALE_DIR
         }
     )
 
 
 def get_up_compose_cmd(services):
-    return ('docker-compose', '-f', COMPOSE_PATH, 'up', '-d', *services)
+    return ('docker compose', '-f', COMPOSE_PATH, 'up', '-d', *services)
 
 
 def get_up_compose_sync_cmd():
-    return ('docker-compose', '-f', SYNC_COMPOSE_PATH, 'up', '-d')
+    return ('docker compose', '-f', SYNC_COMPOSE_PATH, 'up', '-d')
 
 
 def get_compose_path(sync_node: bool) -> str: