From 782f00f09ec78f1e340d051c812a63b405e51d81 Mon Sep 17 00:00:00 2001
From: John ODonnell <john.odonnell@cyberark.com>
Date: Fri, 15 Dec 2023 10:26:46 -0500
Subject: [PATCH] CNJR-2127: Use Docker Compose v2

---
 ci/start_dev_environment         | 2 +-
 ci/test_e2e                      | 2 +-
 ci/test_integration              | 2 +-
 ci/utils                         | 8 ++++----
 conjur-env/build.sh              | 4 ++--
 tests/retrieve-secrets/README.md | 2 +-
 tests/retrieve-secrets/start     | 8 ++++----
 tests/retrieve-secrets/stop      | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ci/start_dev_environment b/ci/start_dev_environment
index 30e9249..40e1988 100755
--- a/ci/start_dev_environment
+++ b/ci/start_dev_environment
@@ -9,7 +9,7 @@ build_test_images
 start_conjur
 
 # Runs the cflinux4 image in interactive mode with the project files mounted
-docker-compose \
+docker compose \
   -f "$DOCKER_COMPOSE_FILE" \
   run --rm \
   -e BUILDPACK_BUILD_DIR="/cyberark/cloudfoundry-conjur-buildpack/conjur_buildpack" \
diff --git a/ci/test_e2e b/ci/test_e2e
index afa3cf3..3fa4d4b 100755
--- a/ci/test_e2e
+++ b/ci/test_e2e
@@ -49,7 +49,7 @@ popd
 
 announce 'Running Cucumber tests...'
 # Run tests against latest build of buildpack (including integration tests against remote foundation)
-docker-compose \
+docker compose \
     -f "$DOCKER_COMPOSE_FILE" \
     run --rm \
     -w "$CONTAINER_FEATURES_DIR" \
diff --git a/ci/test_integration b/ci/test_integration
index 048e8ce..3334a97 100755
--- a/ci/test_integration
+++ b/ci/test_integration
@@ -23,7 +23,7 @@ start_conjur
 [[ -z $JENKINS_HOME ]] && package_and_unpack_buildpack
 
 announce 'Running Cucumber tests...'
-docker-compose \
+docker compose \
     -f "$DOCKER_COMPOSE_FILE" \
     run --rm \
     -w "$CONTAINER_FEATURES_DIR" \
diff --git a/ci/utils b/ci/utils
index 45dba29..4dcab15 100755
--- a/ci/utils
+++ b/ci/utils
@@ -13,7 +13,7 @@ function announce {
 
 function finish {
   announce 'Removing environment...'
-  docker-compose -f "$DOCKER_COMPOSE_FILE" down -v
+  docker compose -f "$DOCKER_COMPOSE_FILE" down -v
 }
 
 function package_and_unpack_buildpack {
@@ -36,14 +36,14 @@ function setup_env {
 
 function build_test_images {
   announce 'Building test images...'
-  docker-compose -f "$DOCKER_COMPOSE_FILE" build
+  docker compose -f "$DOCKER_COMPOSE_FILE" build
 }
 
 function start_conjur {
   announce 'Waiting for Conjur to start...'
-  docker-compose -f "$DOCKER_COMPOSE_FILE" up -d conjur
+  docker compose -f "$DOCKER_COMPOSE_FILE" up -d conjur
 
-  docker-compose -f "$DOCKER_COMPOSE_FILE" exec -T conjur conjurctl wait -r 45 -p 80
+  docker compose -f "$DOCKER_COMPOSE_FILE" exec -T conjur conjurctl wait -r 45 -p 80
 }
 
 
diff --git a/conjur-env/build.sh b/conjur-env/build.sh
index 935f9bb..094875a 100755
--- a/conjur-env/build.sh
+++ b/conjur-env/build.sh
@@ -4,5 +4,5 @@ cd "$(dirname "$0")"
 
 rm -rf ../vendor/conjur-env
 
-docker-compose build
-docker-compose run --rm conjur-env-builder
+docker compose build
+docker compose run --rm conjur-env-builder
diff --git a/tests/retrieve-secrets/README.md b/tests/retrieve-secrets/README.md
index 03be222..706caf2 100644
--- a/tests/retrieve-secrets/README.md
+++ b/tests/retrieve-secrets/README.md
@@ -49,7 +49,7 @@ environment, then  assert upon the output. BATS offers the `$output` variable, w
 contains the output from the previous command executed using the `run` prefix.
 
 ### `stop`
-Removes existing docker-compose containers
+Removes existing Docker Compose environment
 
 ### Configuration
 
diff --git a/tests/retrieve-secrets/start b/tests/retrieve-secrets/start
index b25ef94..f9e16b1 100755
--- a/tests/retrieve-secrets/start
+++ b/tests/retrieve-secrets/start
@@ -10,13 +10,13 @@ mkdir -p temp_clone_dir
 git clone https://github.com/ztombol/bats-support temp_clone_dir/bats-support
 git clone https://github.com/ztombol/bats-assert temp_clone_dir/bats-assert
 
-docker-compose build
-docker-compose run --rm mock-conjur-env-builder
+docker compose build
+docker compose run --rm mock-conjur-env-builder
 
 echo "Starting tests for 0001_retrieve-secrets.sh..."
 
 # Uncomment when running locally
-# docker-compose run --rm tester --formatter tap ./test
+# docker compose run --rm tester --formatter tap ./test
 
 # Comment out when running locally
-docker-compose run --rm tester --formatter junit ./test
+docker compose run --rm tester --formatter junit ./test
diff --git a/tests/retrieve-secrets/stop b/tests/retrieve-secrets/stop
index 9cc9f94..356cea7 100755
--- a/tests/retrieve-secrets/stop
+++ b/tests/retrieve-secrets/stop
@@ -4,7 +4,7 @@ function finish {
   echo 'Removing environment...'
 
   rm -rf temp_clone_dir
-  docker-compose down -v
+  docker compose down -v
 }
 
 finish