From e4aeccb2b01885f839bb3aa3fe37776b2909ac8b Mon Sep 17 00:00:00 2001 From: lukinovec Date: Tue, 25 Apr 2023 12:33:56 +0200 Subject: [PATCH] Make postgres work in tests --- docker-compose.yml | 12 ++++++++---- tests/TestCase.php | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 43cb3d5e..3868d731 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,13 +53,17 @@ services: retries: 10 postgres: image: 'postgres:15' + user: 'postgres' ports: - - '${FORWARD_DB_PORT:-5433}:5433' + - '${FORWARD_DB_PORT:-5434}:5434' environment: - PGPASSWORD: '${DB_PASSWORD:-password}:password' + PGPASSWORD: 'postgres' + PGPORT: '5434' POSTGRES_DB: main - POSTGRES_USER: '${DB_USERNAME:-root}:root' - POSTGRES_PASSWORD: '${DB_PASSWORD:-password}:password' + POSTGRES_USER: 'postgres' + POSTGRES_PASSWORD: 'postgres' + expose: + - "5434" healthcheck: test: - CMD diff --git a/tests/TestCase.php b/tests/TestCase.php index 77b9ca4c..e3a50806 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -88,10 +88,10 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), 'host' => 'postgres', - 'port' => env('DB_PORT', '5433'), + 'port' => '5434', 'database' => 'main', - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), + 'username' => 'postgres', + 'password' => 'postgres', 'charset' => 'utf8', 'prefix' => '', 'prefix_indexes' => true,