Global/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2025-12-05 22:20:24 -08:00
Code Issues Packages Projects Releases Wiki Activity

rename to compose.yml

Browse Source
This commit is contained in:
Steven Tang
2023-12-29 16:30:18 +11:00
parent 856ee276e4
commit 9787a5ed59
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.dockerignore
View File

@@ -5,9 +5,9 @@ config*.yml
*.exe *.exe
wakapi wakapi
Dockerfile Dockerfile
docker-compose.yml compose.yml
.dockerignore .dockerignore
.git* .git*
node_modules/ node_modules/
testing/*.zip testing/
testing/wakapi coverage/

0
docker-compose.yml → compose.yml
View File

0
testing/docker-compose.yml → testing/compose.yml
View File

6
testing/run_api_tests.sh
View File

@@ -39,7 +39,7 @@ cleanup() {
kill -TERM "$pid" kill -TERM "$pid"
fi fi
if [ "${docker_down-0}" -eq 1 ]; then 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 fi
} }
trap cleanup EXIT trap cleanup EXIT
@@ -47,10 +47,10 @@ trap cleanup EXIT
# Initialise test data # Initialise test data
case $DB_TYPE in case $DB_TYPE in
postgres|mysql|mariadb|cockroach) 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_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" config="config.$DB_TYPE.yml"
if [ "$DB_TYPE" == "mariadb" ]; then if [ "$DB_TYPE" == "mariadb" ]; then