feat: move postgres-variables from compose to .env. (#41)

* feat: move postgres-variables from compose to .env.

* fix: craete .env earlier in workflow

---------

Co-authored-by: Kenneth <[email protected]>

Author: ZnarreZ

.env.ci.testing

@@ -1,11 +1,17 @@
 # php artisan key:generate
 APP_KEY=base64:nfTdlWswyvfctT6YNgk92bZaKWs5HfhdcyIXWmJUcuk=
 
-# Must match compose.yml -> db -> environment
+# devcontainer
 DB_USERNAME=laravel
 DB_DATABASE=wannabe5
 DB_PASSWORD=mydevelopmentexample
 
+
+# db (loading variables from dev_container, so no need to change here)
+POSTGRES_USER=${DB_USERNAME}
+POSTGRES_DB=${DB_DATABASE}
+POSTGRES_PASSWORD=${DB_PASSWORD}
+
 TELESCOPE_ENABLED=true
 # Log to stdout/stderr
 LOG_LEVEL=debug

.env.example

@@ -6,12 +6,17 @@ APP_ENV=local
 # Intended for use in docker containers, meaning `php artisan serve` will accept traffic from any source
 SERVER_HOST=0.0.0.0
 
-# Must match compose.yml -> db -> environment
+# devcontainer
 DB_HOST=db
 DB_USERNAME=laravel
 DB_DATABASE=wannabe5
 DB_PASSWORD=mydevelopmentexample
 
+# db (loading variables from dev_container, so no need to change here)
+POSTGRES_USER=${DB_USERNAME}
+POSTGRES_DB=${DB_DATABASE}
+POSTGRES_PASSWORD=${DB_PASSWORD}
+
 TELESCOPE_ENABLED=true
 # Log to stdout/stderr
 LOG_LEVEL=debug

.github/workflows/ci.yaml

@@ -14,6 +14,7 @@ jobs:
           fetch-depth: 1
       - name: Setup database using docker
         run: |
+          cp .env.ci.testing .env
           docker compose -f compose.yml up db -d
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -25,7 +26,6 @@ jobs:
         run: composer install -n --prefer-dist
       - name: Prepare Laravel Application
         run: |
-          cp .env.ci.testing .env
           php artisan key:generate
           php artisan migrate --force -n
       - name: Run tests
@@ -34,4 +34,4 @@ jobs:
         run: |
           php artisan scramble:analyze
           php artisan scramble:export --path=openapi-ci.json
-          diff openapi.json openapi-ci.json
+          diff openapi.json openapi-ci.json

compose.yml

@@ -15,9 +15,6 @@ services:
     image: postgres
     ports:
       - 127.0.0.1:5432:5432
-    environment:
-      POSTGRES_USER: laravel
-      POSTGRES_DB: wannabe5
-      POSTGRES_PASSWORD: mydevelopmentexample
+    env_file: .env
     volumes:
-      - ./scripts/create-test-db.sh:/docker-entrypoint-initdb.d/create-test-db.sh
+      - ./scripts/create-test-db.sh:/docker-entrypoint-initdb.d/create-test-db.sh