From c34c02a58064bab0680e54d245ac253deee35929 Mon Sep 17 00:00:00 2001
From: kiblik <5609770+kiblik@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:30:27 +0000
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>
---
 dc-build.sh                                         | 8 ++++----
 dc-down.sh                                          | 8 ++++----
 dc-integration-tests.sh                             | 4 ++--
 dc-stop.sh                                          | 8 ++++----
 dc-unittest.sh                                      | 4 ++--
 dc-up-d.sh                                          | 4 ++--
 dc-up.sh                                            | 4 ++--
 docs/content/en/getting_started/upgrading/_index.md | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/dc-build.sh b/dc-build.sh
index c80f691185d..fd908428207 100755
--- a/dc-build.sh
+++ b/dc-build.sh
@@ -7,15 +7,15 @@ if [ $# -eq 0 ]
 then
     echo "Building docker compose"
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose build
 else
     echo "Building docker compose with additional parameter $1 ..."
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose build "$1"
 fi
diff --git a/dc-down.sh b/dc-down.sh
index c60a6e53f77..3ef3c667c49 100755
--- a/dc-down.sh
+++ b/dc-down.sh
@@ -7,15 +7,15 @@ if [ $# -eq 0 ]
 then
     echo "Stopping docker compose and removing containers"
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose down
 else
     echo "Stopping docker compose and removing containers with additional parameter $1 ..."
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose down "$1"
 fi
diff --git a/dc-integration-tests.sh b/dc-integration-tests.sh
index af4debf5ced..88267f8f6f1 100755
--- a/dc-integration-tests.sh
+++ b/dc-integration-tests.sh
@@ -44,9 +44,9 @@ done
 echo "Running docker compose unit tests with profile postgres-redis and test case $TEST_CASE ..."
 
 # Compose V2 integrates compose functions into the Docker platform,
-# continuing to support most of the previous docker compose features
+# continuing to support most of the previous docker-compose features
 # and flags. You can run Compose V2 by replacing the hyphen (-) with
-# a space, using docker compose, instead of docker compose.
+# a space, using docker compose, instead of docker-compose.
 echo "Building images..."
 ./docker/setEnv.sh integration_tests
 ./dc-build.sh
diff --git a/dc-stop.sh b/dc-stop.sh
index 95c8393989a..8dc82e09a60 100755
--- a/dc-stop.sh
+++ b/dc-stop.sh
@@ -7,15 +7,15 @@ if [ $# -eq 0 ]
 then
     echo "Stopping docker compose"
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose stop
 else
     echo "Stopping docker compose with additional parameter $1 ..."
     # Compose V2 integrates compose functions into the Docker platform,
-    # continuing to support most of the previous docker compose features
+    # continuing to support most of the previous docker-compose features
     # and flags. You can run Compose V2 by replacing the hyphen (-) with
-    # a space, using docker compose, instead of docker compose.
+    # a space, using docker compose, instead of docker-compose.
     docker compose stop "$1"
 fi
diff --git a/dc-unittest.sh b/dc-unittest.sh
index b9b48b971a8..5f8e4788a88 100755
--- a/dc-unittest.sh
+++ b/dc-unittest.sh
@@ -57,6 +57,6 @@ fi
 
 echo "Running docker compose unit tests with test case $TEST_CASE ..."
 # Compose V2 integrates compose functions into the Docker platform, continuing to support 
-# most of the  previous docker compose features and flags. You can run Compose V2 by 
-# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
+# most of the  previous docker-compose features and flags. You can run Compose V2 by 
+# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
 docker compose exec uwsgi bash -c "python manage.py test $TEST_CASE -v2 --keepdb"
diff --git a/dc-up-d.sh b/dc-up-d.sh
index 0cf5dd17934..abe694783cf 100755
--- a/dc-up-d.sh
+++ b/dc-up-d.sh
@@ -6,6 +6,6 @@ if [[ $? -eq 1 ]]; then exit 1; fi
 echo "Starting docker compose in the background ..."
 
 # Compose V2 integrates compose functions into the Docker platform, continuing to support 
-# most of the  previous docker compose features and flags. You can run Compose V2 by 
-# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
+# most of the  previous docker-compose features and flags. You can run Compose V2 by 
+# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
 docker compose up --no-deps -d
diff --git a/dc-up.sh b/dc-up.sh
index cb74db97f2d..347f844fc85 100755
--- a/dc-up.sh
+++ b/dc-up.sh
@@ -4,7 +4,7 @@ bash ./docker/docker-compose-check.sh
 if [[ $? -eq 1 ]]; then exit 1; fi
 
 # Compose V2 integrates compose functions into the Docker platform, continuing to support 
-# most of the  previous docker compose features and flags. You can run Compose V2 by 
-# replacing the hyphen (-) with a space, using docker compose, instead of docker compose.
+# most of the  previous docker-compose features and flags. You can run Compose V2 by 
+# replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
 docker compose up --no-deps
 echo "Starting docker compose in the foreground ..."
\ No newline at end of file
diff --git a/docs/content/en/getting_started/upgrading/_index.md b/docs/content/en/getting_started/upgrading/_index.md
index dcad25d7345..a7f5aa30906 100644
--- a/docs/content/en/getting_started/upgrading/_index.md
+++ b/docs/content/en/getting_started/upgrading/_index.md
@@ -41,7 +41,7 @@ The generic upgrade method for docker compose are as follows:
     docker pull defectdojo/defectdojo-nginx:1.10.2-alpine
     ```
 
--   Go to the directory where your docker compose.yml file lives
+-   Go to the directory where your docker-compose.yml file lives
 -   Stop DefectDojo: `./dc-stop.sh`
 -   Re-start DefectDojo, allowing for container recreation:
     `./dc-up-d.sh`