rename to compose.yml

Milopadma · Dec 29, 2023 · 9787a5e · 9787a5e
1 parent 856ee27
commit 9787a5e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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 → compose.yml b/docker-compose.yml → compose.yml
diff --git a/testing/docker-compose.yml → testing/compose.yml b/testing/docker-compose.yml → testing/compose.yml
diff --git a/testing/run_api_tests.sh b/testing/run_api_tests.sh
@@ -39,18 +39,18 @@ 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
 
 # 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