diff --git a/.dockerignore b/.dockerignore index dacd3a7..4ce5c00 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,9 +5,9 @@ config*.yml *.exe wakapi Dockerfile -docker-compose.yml +compose.yml .dockerignore .git* node_modules/ -testing/*.zip -testing/wakapi +testing/ +coverage/ diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml diff --git a/testing/docker-compose.yml b/testing/compose.yml similarity index 100% rename from testing/docker-compose.yml rename to testing/compose.yml diff --git a/testing/run_api_tests.sh b/testing/run_api_tests.sh index 7799965..676c62f 100755 --- a/testing/run_api_tests.sh +++ b/testing/run_api_tests.sh @@ -39,7 +39,7 @@ cleanup() { kill -TERM "$pid" fi if [ "${docker_down-0}" -eq 1 ]; then - docker compose -f "$script_dir/docker-compose.yml" down + docker compose -f "$script_dir/compose.yml" down fi } trap cleanup EXIT @@ -47,10 +47,10 @@ trap cleanup EXIT # Initialise test data case $DB_TYPE in postgres|mysql|mariadb|cockroach) - docker compose -f "$script_dir/docker-compose.yml" down + docker compose -f "$script_dir/compose.yml" down docker_down=1 - docker compose -f "$script_dir/docker-compose.yml" up --wait --detach "$DB_TYPE" + docker compose -f "$script_dir/compose.yml" up --wait --detach "$DB_TYPE" config="config.$DB_TYPE.yml" if [ "$DB_TYPE" == "mariadb" ]; then