File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -121,11 +121,15 @@ if ! [ -x "${docker_cmd}" ]; then
121121 exit ${no_dep_exit_code}
122122fi
123123
124- docker_compose_cmd=" $( command -v docker-compose) "
125- if ! [ -x " ${docker_compose_cmd} " ]; then
124+ if docker compose > /dev/null; then
125+ docker_compose_cmd=" docker compose"
126+ elif command -v docker-compose > /dev/null; then
127+ docker_compose_cmd=" docker-compose"
128+ else
126129 e " required dependency not found: docker-compose not found in the path or not executable"
127130 exit ${no_dep_exit_code}
128131fi
132+ e " Using Docker Compose command: ${docker_compose_cmd} "
129133
130134curl_cmd=" $( command -v curl) "
131135if ! [ -x " ${curl_cmd} " ]; then
@@ -161,7 +165,7 @@ compose() {
161165 export NGINX_INTERNAL_PORT=80
162166 fi
163167
164- " ${docker_compose_cmd} " -f " ${test_compose_config} " -p " ${test_compose_project} " " $@ "
168+ ${docker_compose_cmd} -f " ${test_compose_config} " -p " ${test_compose_project} " " $@ "
165169}
166170
167171integration_test () {
You can’t perform that action at this time.
0 commit comments