From 5b6dc09853c8f599bbcb4d774175fbd207493713 Mon Sep 17 00:00:00 2001
From: Joshua Williams <joshuaw@hpe.com>
Date: Sun, 8 Dec 2024 14:41:31 -0800
Subject: [PATCH] CASMHMS-6294: Fix docker-compose invocations

---
 runCT.sh       | 14 +++++++-------
 runUnitTest.sh |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/runCT.sh b/runCT.sh
index 59027613..bc9d4b63 100755
--- a/runCT.sh
+++ b/runCT.sh
@@ -3,7 +3,7 @@
 #
 # MIT License
 #
-# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -34,7 +34,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 function cleanup() {
   echo "Cleaning up containers..."
-  docker-compose down
+  docker compose down
   if ! [[ $? -eq 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -44,16 +44,16 @@ function cleanup() {
 
 # Get the base containers running
 echo "Starting containers..."
-docker-compose build --no-cache
-docker-compose up --exit-code-from wait-for-smd wait-for-smd
-docker-compose up --exit-code-from smoke-tests smoke-tests
+docker compose build --no-cache
+docker compose up --exit-code-from wait-for-smd wait-for-smd
+docker compose up --exit-code-from smoke-tests smoke-tests
 test_result=$?
 if [[ $test_result -ne 0 ]]; then
   echo "CT smoke tests FAILED!"
   cleanup 1
 fi
 
-docker-compose up --exit-code-from tavern-tests tavern-tests
+docker compose up --exit-code-from tavern-tests tavern-tests
 test_result=$?
 if [[ $test_result -ne 0 ]]; then
   echo "CT tavern tests FAILED!"
@@ -62,4 +62,4 @@ fi
 
 # Cleanup
 echo "CT tests PASSED!"
-cleanup 0
\ No newline at end of file
+cleanup 0
diff --git a/runUnitTest.sh b/runUnitTest.sh
index 350c7b2b..2c38339a 100755
--- a/runUnitTest.sh
+++ b/runUnitTest.sh
@@ -2,7 +2,7 @@
 
 # MIT License
 #
-# (C) Copyright [2021-2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2021-2022,2024] Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -33,7 +33,7 @@ echo "COMPOSE_FILE: $COMPOSE_FILE"
 
 
 function cleanup() {
-  docker-compose down
+  docker compose down
   if ! [[ $? -eq 0 ]]; then
     echo "Failed to decompose environment!"
     exit 1
@@ -43,8 +43,8 @@ function cleanup() {
 
 
 echo "Starting containers..."
-docker-compose build --no-cache
-docker-compose up --exit-code-from unit-tests unit-tests
+docker compose build --no-cache
+docker compose up --exit-code-from unit-tests unit-tests
 
 test_result=$?