summaryrefslogtreecommitdiffstatshomepage
path: root/test/integration
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/docker/test.sh16
1 files changed, 5 insertions, 11 deletions
diff --git a/test/integration/docker/test.sh b/test/integration/docker/test.sh
index 1e671c0..7915ca1 100755
--- a/test/integration/docker/test.sh
+++ b/test/integration/docker/test.sh
@@ -17,12 +17,6 @@ readonly client_key_password='password'
readonly output_dir="$script_dir/cgitize/output"
readonly frontend_host=localhost
-if command -v docker-compose > /dev/null 2>&1; then
- readonly docker_compose=docker-compose
-else
- readonly docker_compose='docker compose'
-fi
-
dump() {
local prefix="${FUNCNAME[0]}"
[ "${#FUNCNAME[@]}" -gt 1 ] && prefix="${FUNCNAME[1]}"
@@ -165,12 +159,12 @@ docker_build() {
echo Building Docker images
echo ----------------------------------------------------------------------
- $docker_compose --progress plain build
+ docker compose --progress plain build
}
docker_cleanup() {
dump 'cleaning up Docker data'
- $docker_compose down --rmi all --volumes
+ docker compose down --rmi all --volumes
# Use `docker system prune` as well?
}
@@ -186,7 +180,7 @@ run_git_server() {
echo Running the Git server
echo ----------------------------------------------------------------------
- $docker_compose up -d git_server
+ docker compose up -d git_server
}
run_cgitize() {
@@ -200,7 +194,7 @@ run_cgitize() {
return 1
fi
dump "SSH_AUTH_SOCK: $SSH_AUTH_SOCK"
- $docker_compose run --rm cgitize
+ docker compose run --rm cgitize
}
run_frontend() {
@@ -209,7 +203,7 @@ run_frontend() {
echo Running the frontend
echo ----------------------------------------------------------------------
- $docker_compose up -d frontend
+ docker compose up -d frontend
sleep 2
}