From 80870e8d1dc914913ea8c8c565619bee09d998e8 Mon Sep 17 00:00:00 2001
From: Alexey Rogachev <arogachev90@gmail.com>
Date: Fri, 6 Dec 2024 22:22:10 +0500
Subject: [PATCH] WIP [skip ci]

---
 Makefile                  | 8 ++++----
 docker/docker-compose.yml | 8 ++++----
 docs/internals.md         | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e7d0e2045..32aa06c74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 run: ## Run arbitrary command.
-	docker compose run \
+	docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml run \
 	--rm \
 	--entrypoint $(CMD) \
 	php
@@ -16,7 +16,7 @@ test-base: testsuite-Db ## Run tests for base db package only.
 test-driver-sqlite: testsuite-Sqlite ## Run tests for SQLite driver only.
 test-driver-mysql: testsuite-Mysql ## Run tests for MySQL driver only (using MySQL database).
 test-driver-mariadb: ## Run tests for MySQL driver only (using MariaDB database).
-	docker compose run \
+	docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml run \
 	--rm \
 	--entrypoint "vendor/bin/phpunit --testsuite Mysql $(RUN_ARGS)" \
 	-e YII_MYSQL_TYPE=mariadb \
@@ -24,13 +24,13 @@ test-driver-mariadb: ## Run tests for MySQL driver only (using MariaDB database)
 test-driver-pgsql: testsuite-Pgsql ## Run tests for PostgreSQL driver only.
 test-driver-mssql: testsuite-Mssql ## Run tests for Microsoft SQL Server driver only.
 test-driver-oracle: ## Run tsets for Oracle driver only.
-	docker compose run \
+	docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml run \
 	--rm \
 	--entrypoint "bash -c -l 'vendor/bin/phpunit --testsuite Oracle $(RUN_ARGS)'" \
 	php
 
 testsuite-%:
-	docker compose run \
+	docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.yml run \
 	--rm \
 	--entrypoint "vendor/bin/phpunit --testsuite $(subst testsuite-,,$@) $(RUN_ARGS)" \
 	php
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5050af55e..097ce046c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,10 +4,10 @@ services:
       context: ./..
       dockerfile: ./docker/Dockerfile
     volumes:
-      - ./src:/code/src
-      - ./tests:/code/tests
-      - ./composer.json:/code/composer.json
-      - ./phpunit.xml.dist:/code/phpunit.xml.dist
+      - ./../src:/code/src
+      - ./../tests:/code/tests
+      - ./../composer.json:/code/composer.json
+      - ./../phpunit.xml.dist:/code/phpunit.xml.dist
     environment:
       YII_MYSQL_DATABASE: yii
       YII_MYSQL_HOST: mysql
diff --git a/docs/internals.md b/docs/internals.md
index 53fe939b3..cafb9ad51 100644
--- a/docs/internals.md
+++ b/docs/internals.md
@@ -25,7 +25,7 @@ Clone all repos of drivers' packages:
 - [Microsoft SQL Server](https://github.com/yiisoft/db-mssql)
 - [Oracle](https://github.com/yiisoft/oracle)
 
-Create `docker-compose.override.yml` file in the root of the package. Add this contents:
+Create `docker/docker-compose.override.yml` file with this content:
 
 ```yaml
 services: