Skip to content

Commit

Permalink
run-tests.sh: configurable DOCKER_COMPOSE command.
Browse files Browse the repository at this point in the history
Default to "docker-compose" but allow override for newer configuration
that uses "docker compose" (compose as part of docker command itself).
  • Loading branch information
kanaka committed Apr 3, 2024
1 parent 1c45e19 commit d43f7ed
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

export VERBOSE=${VERBOSE:-}
export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-conlink-test}
export DOCKER_COMPOSE=${DOCKER_COMPOSE:-docker-compose}
declare TEST_NUM=0
declare -A RESULTS
declare PASS=0
declare FAIL=0

die() { echo >&2 "${*}"; exit 1; }
vecho() { [ "${VERBOSE}" ] && echo "${*}" || true; }
dc() { docker-compose "${@}"; }
dc() { ${DOCKER_COMPOSE} "${@}"; }
mdc() { ./mdc "${@}" || die "mdc invocation failed"; }

dc_init() {
Expand Down

0 comments on commit d43f7ed

Please sign in to comment.