From 6ea48773d88b2b6ad87afec416a36622a269dbff Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@trio.dhs.gov>
Date: Tue, 7 Jun 2022 17:11:01 -0400
Subject: [PATCH] Update code to use the "docker compose" syntax vice
 "docker-compose"

The "docker compose" syntax is the preferred (and only correct) syntax
after the changes in cisagov/ansible-role-docker#60.
---
 README.md                          | 2 +-
 gophish-tools/complete_campaign.sh | 4 ++--
 gophish-tools/export_assessment.sh | 4 ++--
 gophish-tools/gophish_common.sh    | 2 +-
 gophish-tools/import_assessment.sh | 4 ++--
 gophish-tools/test_assessment.sh   | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 114c193..a90f63c 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Creates a Docker composition containing instances of:
 A sample [docker composition](docker-compose.yml) is included
 in this repository.
 
-To start the composition use the command: `docker-compose up`
+To start the composition use the command: `docker compose up`
 
 It's normal for the `gophish-tools` container to exit shortly after startup;
 it is included in this composition as a convenience for phishing operators.
diff --git a/gophish-tools/complete_campaign.sh b/gophish-tools/complete_campaign.sh
index 2ca3e69..55045f7 100755
--- a/gophish-tools/complete_campaign.sh
+++ b/gophish-tools/complete_campaign.sh
@@ -22,14 +22,14 @@ source "$SCRIPTS_DIR/gophish_common.sh"
 CAMPAIGN_ID=$1
 
 # Disable errexit to allow error-handling within get_gophish_api_key
-# and for the subsequent docker-compose call to gophish-complete
+# and for the subsequent docker compose call to gophish-complete
 set +o errexit
 
 # Fetch GoPhish API key
 API_KEY=$(get_gophish_api_key)
 
 # Run gophish-complete in the Docker composition
-docker-compose -f "$GOPHISH_COMPOSITION" run --rm \
+docker compose -f "$GOPHISH_COMPOSITION" run --rm \
   gophish-tools gophish-complete "--campaign=$CAMPAIGN_ID" \
   "$GOPHISH_URL" "$API_KEY"
 complete_rc="$?"
diff --git a/gophish-tools/export_assessment.sh b/gophish-tools/export_assessment.sh
index f755305..6b72f46 100755
--- a/gophish-tools/export_assessment.sh
+++ b/gophish-tools/export_assessment.sh
@@ -24,14 +24,14 @@ ASSESSMENT_ID=$1
 GOPHISH_WRITABLE_DIR="/var/pca/pca-gophish-composition/data"
 
 # Disable errexit to allow error-handling within get_gophish_api_key
-# and for the subsequent docker-compose call to gophish-export
+# and for the subsequent docker compose call to gophish-export
 set +o errexit
 
 # Fetch GoPhish API key
 API_KEY=$(get_gophish_api_key)
 
 # Run gophish-export in the Docker composition
-docker-compose -f "$GOPHISH_COMPOSITION" run --rm \
+docker compose -f "$GOPHISH_COMPOSITION" run --rm \
   --volume "$GOPHISH_WRITABLE_DIR":/home/cisa \
   gophish-tools gophish-export "$ASSESSMENT_ID" "$GOPHISH_URL" "$API_KEY"
 export_rc="$?"
diff --git a/gophish-tools/gophish_common.sh b/gophish-tools/gophish_common.sh
index 4dfdc02..82bf909 100644
--- a/gophish-tools/gophish_common.sh
+++ b/gophish-tools/gophish_common.sh
@@ -12,7 +12,7 @@ GOPHISH_URL="https://gophish:3333"
 
 function get_gophish_api_key {
   # Fetch GoPhish API key
-  API_KEY=$(docker-compose -f "$GOPHISH_COMPOSITION" exec -T gophish get-api-key)
+  API_KEY=$(docker compose -f "$GOPHISH_COMPOSITION" exec -T gophish get-api-key)
   api_key_rc="$?"
   if [ "$api_key_rc" -ne 0 ]; then
     echo "ERROR: Failed to obtain GoPhish API key from Docker composition."
diff --git a/gophish-tools/import_assessment.sh b/gophish-tools/import_assessment.sh
index 9a8b6f5..e5217e0 100755
--- a/gophish-tools/import_assessment.sh
+++ b/gophish-tools/import_assessment.sh
@@ -24,14 +24,14 @@ ASSESSMENT_FILE_BASE=$(basename "$ASSESSMENT_FILE")
 ASSESSMENT_FILE_DIR=$(readlink -f "$ASSESSMENT_FILE" | xargs dirname)
 
 # Disable errexit to allow error-handling within get_gophish_api_key
-# and for the subsequent docker-compose call to gophish-import
+# and for the subsequent docker compose call to gophish-import
 set +o errexit
 
 # Fetch GoPhish API key
 API_KEY=$(get_gophish_api_key)
 
 # Run gophish-import in the Docker composition
-docker-compose -f "$GOPHISH_COMPOSITION" run --rm \
+docker compose -f "$GOPHISH_COMPOSITION" run --rm \
   --volume "$ASSESSMENT_FILE_DIR":/home/cisa gophish-tools \
   gophish-import "$ASSESSMENT_FILE_BASE" "$GOPHISH_URL" "$API_KEY"
 import_rc="$?"
diff --git a/gophish-tools/test_assessment.sh b/gophish-tools/test_assessment.sh
index 82bc48a..1c2072b 100755
--- a/gophish-tools/test_assessment.sh
+++ b/gophish-tools/test_assessment.sh
@@ -22,14 +22,14 @@ source "$SCRIPTS_DIR/gophish_common.sh"
 ASSESSMENT_ID=$1
 
 # Disable errexit to allow error-handling within get_gophish_api_key
-# and for the subsequent docker-compose call to gophish-test
+# and for the subsequent docker compose call to gophish-test
 set +o errexit
 
 # Fetch GoPhish API key
 API_KEY=$(get_gophish_api_key)
 
 # Run gophish-test in the Docker composition
-docker-compose -f "$GOPHISH_COMPOSITION" run --rm \
+docker compose -f "$GOPHISH_COMPOSITION" run --rm \
   gophish-tools gophish-test "$ASSESSMENT_ID" "$GOPHISH_URL" "$API_KEY"
 test_rc="$?"
 if [ "$test_rc" -eq 0 ]; then