Fix the host for redis and psql

MbinOrg · Dec 18, 2024 · e4f5cea · e4f5cea
1 parent fbe13ff
commit e4f5cea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.env.test b/.env.test
@@ -6,8 +6,10 @@ PANTHER_APP_ENV=panther
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 
 # Mbin variables
-DATABASE_URL="postgresql://mbin:ChangeThisPostgresPass@127.0.0.1:5433/mbin?serverVersion=16&charset=utf8"
-REDIS_DNS=redis://123456789@127.0.0.1:6380
+DATABASE_HOST=127.0.0.1
+DATABASE_URL="postgresql://mbin:ChangeThisPostgresPass@${DATABASE_HOST}:5433/mbin?serverVersion=16&charset=utf8"
+REDIS_HOST=127.0.0.1
+REDIS_DNS=redis://123456789@${REDIS_HOST}:6380
 MAILER_DSN=null://default
 KBIN_JS_ENABLED=false
 KBIN_DEFAULT_LANG=en

diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml
@@ -107,11 +107,13 @@ jobs:
         env:
           COMPOSER_CACHE_DIR: ${{ steps.composer-cache.outputs.dir }}
           SYMFONY_DEPRECATIONS_HELPER: disabled
+          DATABASE_HOST: postgres
+          REDIS_HOST: redis
         run: php bin/phpunit tests/Functional
     services:
       postgres:
         # Docker Hub image
-        image: postgres
+        image: postgres:16
         # Provide the password for postgres
         env:
           POSTGRES_DB: mbin_test
@@ -123,6 +125,9 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+        ports:
+          # Maps port 5433 on service container to the host
+          - 5433:5432
       redis:
         # Docker Hub image
         image: redis
@@ -133,7 +138,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          # Maps port 6379 on service container to the host
+          # Maps port 6380 on service container to the host
           - 6380:6379
 
   audit-check: