replace docker-compose references with docker compose

Author: adityapinglesf

tests/executor.py

@@ -114,7 +114,7 @@ def cleanup_files(self, files):
             raise e
 
     def _clean_docker_env(self):
-        # Remove anything spun up by docker-compose
+        # Remove anything spun up by docker compose
         containers = self.client.containers(filters={"label": "com.docker.compose.project={}".format(self.project_name)})
         for container in containers:
             self.client.remove_container(container["Id"], v=True, force=True)
@@ -237,8 +237,8 @@ def compose_up(self, defaults_url=None, apps_url=None):
         print(command)
         out, err, rc = self._run_command(command, defaults_url, apps_url)
         print("COMPLETED DOCKER COMPOSE")
-        print(f"check RC for docker compose: {rc}; check err for docker-compose: {err}")
-        print("check output for docker-compose")
+        print(f"check RC for docker compose: {rc}; check err for docker compose: {err}")
+        print("check output for docker compose")
         print(out)
         return container_count, rc
 

tests/test_distributed_splunk_image.py

@@ -49,9 +49,9 @@ def setup_method(self, method):
     def teardown_method(self, method):
         if self.compose_file_name and self.project_name:
             if self.DIR:
-                command = "docker-compose -p {} -f {} down --volumes --remove-orphans".format(self.project_name, os.path.join(self.DIR, self.compose_file_name))
+                command = "docker compose -p {} -f {} down --volumes --remove-orphans".format(self.project_name, os.path.join(self.DIR, self.compose_file_name))
             else:
-                command = "docker-compose -p {} -f test_scenarios/{} down --volumes --remove-orphans".format(self.project_name, self.compose_file_name)
+                command = "docker compose -p {} -f test_scenarios/{} down --volumes --remove-orphans".format(self.project_name, self.compose_file_name)
             out, err, rc = self._run_command(command)
             self._clean_docker_env()
         if self.DIR:
@@ -1104,4 +1104,4 @@ def test_compose_3idx1cm_splunktcp_ssl(self):
                         os.path.join(self.DEFAULTS_DIR, "cert.pem"),
                         os.path.join(self.DEFAULTS_DIR, "{}.yml".format(self.project_name))
                     ]
-            self.cleanup_files(files)
+            self.cleanup_files(files)

tests/test_single_splunk_image.py

@@ -48,9 +48,9 @@ def setup_method(self, method):
     def teardown_method(self, method):
         if self.compose_file_name and self.project_name:
             if self.DIR:
-                command = "docker-compose -p {} -f {} down --volumes --remove-orphans".format(self.project_name, os.path.join(self.DIR, self.compose_file_name))
+                command = "docker compose -p {} -f {} down --volumes --remove-orphans".format(self.project_name, os.path.join(self.DIR, self.compose_file_name))
             else:
-                command = "docker-compose -p {} -f test_scenarios/{} down --volumes --remove-orphans".format(self.project_name, self.compose_file_name)
+                command = "docker compose -p {} -f test_scenarios/{} down --volumes --remove-orphans".format(self.project_name, self.compose_file_name)
             out, err, rc = self._run_command(command)
             self._clean_docker_env()
         if self.DIR: