Merge pull request #559 from liberusoftware/copilot/replace-docker-build-setup

Replace Docker setup with laravel-docktane, fix MySQL test pipeline

Author: delicatacurtis

.dockerignore

@@ -65,7 +65,7 @@ Homestead.yaml
 Homestead.json
 /.vagrant
 rr
-.rr.yaml
+# .rr.yaml should not be excluded - it's needed for RoadRunner
 
 # Backup files
 *.bak

.github/workflows/tests.yml

@@ -42,7 +42,7 @@ jobs:
         run: cp .env.testing .env
 
       - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --with-all-dependencies
+        run: composer install --no-progress --prefer-dist
 
       - name: Generate application key
         run: php artisan key:generate

.gitignore

@@ -27,7 +27,7 @@ Homestead.json
 /.vagrant
 .phpunit.result.cache
 rr
-.rr.yaml
+# .rr.yaml is tracked in git (needed for RoadRunner configuration)
 
 # Backup files
 *.bak

.rr.yaml

@@ -0,0 +1,35 @@
+version: "3"
+
+rpc:
+  listen: tcp://127.0.0.1:6001
+
+http:
+  address: 0.0.0.0:80
+  middleware: ["static", "headers", "gzip"]
+  pool:
+    num_workers: 4
+    max_jobs: 64
+    supervisor:
+      max_worker_memory: 128
+  uploads:
+    forbid: [".php", ".exe", ".bat"]
+  static:
+    dir: "public"
+    forbid: [".php", ".htaccess"]
+  headers:
+    response:
+      X-Powered-By: "PHP/Laravel"
+
+logs:
+  mode: production
+  level: warn
+  channels:
+    http:
+      mode: production
+      level: warn
+    server:
+      mode: production
+      level: warn
+    rpc:
+      mode: production
+      level: warn

docker-compose.yml

@@ -0,0 +1,110 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        PHP_VERSION: '8.3'
+        WWWUSER: '${WWWUSER:-1000}'
+        WWWGROUP: '${WWWGROUP:-1000}'
+    image: boilerplate-laravel:latest
+    ports:
+      - '${APP_PORT:-8000}:80'
+    environment:
+      CONTAINER_MODE: http
+      OCTANE_SERVER: roadrunner
+      WITH_SCHEDULER: 'true'
+      WITH_HORIZON: 'false'
+      RUNNING_MIGRATIONS_AND_SEEDERS: '${RUNNING_MIGRATIONS_AND_SEEDERS:-false}'
+    env_file:
+      - .env
+    volumes:
+      - storage:/var/www/html/storage/app
+      - logs:/var/www/html/storage/logs
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - appnet
+
+  worker:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        PHP_VERSION: '8.3'
+    image: boilerplate-laravel:latest
+    environment:
+      CONTAINER_MODE: worker
+      WORKER_COMMAND: 'php /var/www/html/artisan queue:work --sleep=3 --tries=3 --max-time=3600'
+    env_file:
+      - .env
+    volumes:
+      - storage:/var/www/html/storage/app
+      - logs:/var/www/html/storage/logs
+    depends_on:
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - appnet
+    profiles:
+      - worker
+
+  mysql:
+    image: mysql:8.0
+    ports:
+      - '${FORWARD_DB_PORT:-3306}:3306'
+    environment:
+      MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-secret}'
+      MYSQL_DATABASE: '${DB_DATABASE:-liberu}'
+      MYSQL_USER: '${DB_USERNAME:-liberu}'
+      MYSQL_PASSWORD: '${DB_PASSWORD:-secret}'
+    volumes:
+      - mysql:/var/lib/mysql
+    networks:
+      - appnet
+    healthcheck:
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  redis:
+    image: redis:7-alpine
+    ports:
+      - '${FORWARD_REDIS_PORT:-6379}:6379'
+    volumes:
+      - redis:/data
+    networks:
+      - appnet
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'ping']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  mailpit:
+    image: axllent/mailpit:latest
+    ports:
+      - '${FORWARD_MAIL_PORT:-1025}:1025'
+      - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025'
+    networks:
+      - appnet
+
+networks:
+  appnet:
+    driver: bridge
+
+volumes:
+  mysql:
+    driver: local
+  redis:
+    driver: local
+  storage:
+    driver: local
+  logs:
+    driver: local

phpunit.xml

@@ -21,8 +21,12 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="DB_CONNECTION" value="mysql"/>
+        <env name="DB_HOST" value="localhost"/>
+        <env name="DB_PORT" value="3306"/>
+        <env name="DB_DATABASE" value="liberu"/>
+        <env name="DB_USERNAME" value="root"/>
+        <env name="DB_PASSWORD" value="root"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>

tests/Feature/SearchTest.php

@@ -196,5 +196,8 @@
         }
 
         $response->assertStatus(429);
+
+        // Clear rate limiter cache to avoid affecting subsequent tests
+        \Illuminate\Support\Facades\Cache::flush();
     });
 });