RES-2026 Switch CircleCI to use Docker Compose

CLAUDE.md

@@ -143,4 +143,7 @@ npm test
 - Translation files support multiple locales in `lang/` directory
 - Image handling via intervention/image with custom sizing
 - Custom validation rules in `app/Rules/`
-- Event-driven architecture with model observers
+- Event-driven architecture with model observers
+
+## Workflow Guidelines
+- When you create files, add them to git

Dockerfile

@@ -9,11 +9,19 @@ RUN apt-get update && \
         unzip \
         npm \
         vim \
+        netcat-openbsd \
         default-mysql-client \
         postgresql-client && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install Playwright system dependencies
+# We need to install @playwright/test first to get the install-deps command
+RUN npm install -g @playwright/test && \
+    npm install -g jest-junit && \
+    npx playwright install-deps && \
+    npm uninstall -g @playwright/test
+
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/download/2.7.31/install-php-extensions /usr/local/bin/
 
 RUN install-php-extensions \
@@ -23,6 +31,9 @@ RUN install-php-extensions \
     xmlrpc \
     xdebug \
     intl \
+    exif \
+    pcntl \
+    curl \
     gd
 
 # Install composer.  Don't run composer install yet - see docker_run.sh

Taskfile.yml

@@ -8,9 +8,19 @@ dotenv:
 
 env:
   UID:
-    sh: id -u
+    sh: |
+      if command -v id >/dev/null 2>&1; then
+        id -u
+      else
+        echo "1000"
+      fi
   GID:
-    sh: id -g
+    sh: |
+      if command -v id >/dev/null 2>&1; then
+        id -g
+      else
+        echo "1000"
+      fi
 
 vars:
   DOCKER_CMD:
@@ -159,4 +169,95 @@ tasks:
       task docker:run:artisan -- migrate
 
     cmds:
-      - docker exec -it restarters php artisan "{{ .CLI_ARGS }}"
+      - docker exec -it restarters php artisan "{{ .CLI_ARGS }}"
+
+  docker:wait-for-services-*:
+    desc: Wait for Docker services to be ready and responding for a given profile (Usage - task docker:wait-for-services-[core|debug|discourse|all])
+    summary: |
+      Wait for Docker services to be ready by checking their health endpoints.
+      This task will check that services are listening on their ports and returning
+      plausible responses before proceeding, but only for the services in the specified profile.
+
+      For just the core services, use:
+      task docker:wait-for-services-core
+
+      To include debug tools (phpMyAdmin, Mailhog), use:
+      task docker:wait-for-services-debug
+
+      To include Discourse services, use:
+      task docker:wait-for-services-discourse
+
+      To wait for all services, use:
+      task docker:wait-for-services-all
+
+      The task checks:
+      - Core profile: MySQL database, Restarters web app
+      - Debug profile: Core + phpMyAdmin, Mailhog  
+      - Discourse profile: Core + Discourse, PostgreSQL, Redis, Sidekiq
+      - All profile: All services
+
+    requires: *PROFILE_REQUIRES
+
+    vars: *PROFILE_VARS
+
+    cmds:
+      - |
+        # Cross-platform sleep function
+        cross_platform_sleep() {
+          if command -v sleep >/dev/null 2>&1; then
+            sleep "$1"
+          elif command -v powershell >/dev/null 2>&1; then
+            powershell -Command "Start-Sleep -Seconds $1"
+          else
+            # Fallback using ping (works on most systems)
+            ping -n $(($1 + 1)) 127.0.0.1 >/dev/null 2>&1 || ping -c $1 127.0.0.1 >/dev/null 2>&1
+          fi
+        }
+
+        # Generic wait function that takes: service_name, check_command, max_attempts, sleep_interval
+        wait_for_service() {
+          local service_name="$1"
+          local check_command="$2" 
+          local max_attempts="$3"
+          local sleep_interval="$4"
+
+          echo "Waiting for $service_name..."
+          local attempt=0
+          while [ $attempt -lt $max_attempts ]; do
+            if eval "$check_command" >/dev/null 2>&1; then
+              echo "✓ $service_name is ready"
+              return 0
+            fi
+            echo "  $service_name not ready, waiting... (attempt $((attempt + 1))/$max_attempts)"
+            cross_platform_sleep "$sleep_interval"
+            attempt=$((attempt + 1))
+          done
+          echo "❌ $service_name failed to start after $max_attempts attempts"
+          exit 1
+        }
+
+        echo "Waiting for services in profile: {{.PROFILE}}"
+        echo ""
+
+        # Wait for core services (always needed)
+        wait_for_service "MySQL database" "docker exec restarters_db mysqladmin ping -h localhost -u root -ps3cr3t --silent" 60 5
+        wait_for_service "Restarters web application" "curl -f -s http://localhost:8001" 120 5
+
+        # Wait for debug services (if in debug or all profile)
+        {{- if or (eq .PROFILE "debug") (eq .PROFILE "all") }}
+        wait_for_service "phpMyAdmin" "curl -f -s http://localhost:8002" 60 5
+        wait_for_service "Mailhog" "curl -f -s http://localhost:8025" 60 5
+        {{- else }}
+        echo "✓ phpMyAdmin not in profile {{.PROFILE}}, skipping"
+        echo "✓ Mailhog not in profile {{.PROFILE}}, skipping"
+        {{- end }}
+
+        # Wait for discourse services (if in discourse or all profile)
+        {{- if or (eq .PROFILE "discourse") (eq .PROFILE "all") }}
+        wait_for_service "PostgreSQL" "docker exec postgresql pg_isready -U postgres" 60 5
+        wait_for_service "Discourse" "curl -f -s http://localhost:8003" 120 10
+        {{- else }}
+        echo "✓ PostgreSQL not in profile {{.PROFILE}}, skipping"
+        echo "✓ Discourse not in profile {{.PROFILE}}, skipping"
+        {{- end }}
+      - echo "🎉 All services in profile {{.PROFILE}} are ready!"

app/Device.php

@@ -50,6 +50,14 @@ class Device extends Model implements Auditable
 
     use \OwenIt\Auditing\Auditable;
     protected $table = 'devices';
+
+    /**
+     * Check if we're running in CircleCI environment
+     */
+    private static function isCircleCI()
+    {
+        return env('CIRCLECI', false) || env('CI', false);
+    }
     protected $primaryKey = 'iddevices';
     /**
      * The attributes that are mass assignable.
@@ -269,9 +277,13 @@ public function eCo2Diverted($emissionRatio, $displacementFactor)
             if ($this->category == env('MISC_CATEGORY_ID_POWERED') && $this->estimate > 0) {
                 $footprint = $this->estimate * $emissionRatio;
             } else {
-                $footprint = \Cache::remember('category-' . $this->category, 15, function() {
-                    return $this->deviceCategory;
-                })->footprint;
+                if (self::isCircleCI()) {
+                    $footprint = $this->deviceCategory->footprint;
+                } else {
+                    $footprint = \Cache::remember('category-' . $this->category, 15, function() {
+                        return $this->deviceCategory;
+                    })->footprint;
+                }
             }
         }
 
@@ -305,17 +317,25 @@ public function eWasteDiverted()
     {
         $ewasteDiverted = 0;
 
-        $powered = \Cache::remember('category-powered-' . $this->category, 15, function() {
-            return $this->deviceCategory->powered;
-        });
+        if (self::isCircleCI()) {
+            $powered = $this->deviceCategory->powered;
+        } else {
+            $powered = \Cache::remember('category-powered-' . $this->category, 15, function() {
+                return $this->deviceCategory->powered;
+            });
+        }
 
         if ($this->isFixed() && $powered) {
             if ($this->category == env('MISC_CATEGORY_ID_POWERED') && $this->estimate > 0) {
                 $ewasteDiverted = $this->estimate;
             } else {
-                $category = \Cache::remember('category-' . $this->category, 15, function() {
-                    return $this->deviceCategory;
-                });
+                if (self::isCircleCI()) {
+                    $category = $this->deviceCategory;
+                } else {
+                    $category = \Cache::remember('category-' . $this->category, 15, function() {
+                        return $this->deviceCategory;
+                    });
+                }
 
                 $ewasteDiverted = $category->weight;
             }
@@ -454,7 +474,7 @@ public static function getItemTypes()
         // used by the item types.
         //
         // This is slow and the results don't change much, so we use a cache.
-        if (Cache::has('item_types')) {
+        if (!self::isCircleCI() && Cache::has('item_types')) {
             $types = Cache::get('item_types');
         } else {
             $types = DB::select(DB::raw("
@@ -485,7 +505,9 @@ public static function getItemTypes()
                 AND LENGTH(t.item_type) > 0
               GROUP BY t.item_type, t.powered;
 "));
-            \Cache::put('item_types', $types, 24 * 3600);
+            if (!self::isCircleCI()) {
+                \Cache::put('item_types', $types, 24 * 3600);
+            }
         }
 
         return $types;

database/migrations/2020_10_27_101759_repair_status_to_string_data.php

@@ -33,24 +33,6 @@ public function up()
         DB::table('devices')
                 ->where('repair_status', 0)
                 ->update(['repair_status_str' => 'Unknown']);
-        DB::unprepared("CREATE TRIGGER `repair_status_str_up`
-BEFORE UPDATE ON `devices` FOR EACH ROW
-SET NEW.repair_status_str = CASE
-        WHEN NEW.repair_status = 1 THEN 'Fixed'
-        WHEN NEW.repair_status = 2 THEN 'Repairable'
-        WHEN NEW.repair_status = 3 THEN 'End of life'
-        ELSE 'Unknown'
-END;
-");
-        DB::unprepared("CREATE TRIGGER `repair_status_str_in`
-BEFORE INSERT ON `devices` FOR EACH ROW
-SET NEW.repair_status_str = CASE
-        WHEN NEW.repair_status = 1 THEN 'Fixed'
-        WHEN NEW.repair_status = 2 THEN 'Repairable'
-        WHEN NEW.repair_status = 3 THEN 'End of life'
-        ELSE 'Unknown'
-END;
-");
     }
 
     /**
@@ -60,8 +42,6 @@ public function up()
      */
     public function down()
     {
-        DB::unprepared('DROP TRIGGER IF EXISTS `repair_status_str_in`');
-        DB::unprepared('DROP TRIGGER IF EXISTS `repair_status_str_up`');
         if (Schema::hasColumn('devices', 'repair_status_str')) {
             Schema::table('devices', function (Blueprint $table) {
                 $table->dropColumn('repair_status_str');

database/migrations/2025_01_08_000001_drop_repair_status_triggers.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::unprepared('DROP TRIGGER IF EXISTS `repair_status_str_in`');
+        DB::unprepared('DROP TRIGGER IF EXISTS `repair_status_str_up`');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+};

docker-compose.yml

@@ -70,8 +70,6 @@
 # TODO This is stock Discourse - no theme.  Would be nice to have the theme, but that doesn't matter so far as
 # testing the integration.
 
-version: '3'
-
 services:
   # Core services - always enabled
   restarters:
@@ -93,6 +91,7 @@ services:
       SERVICE_TAGS: dev
       UID: ${UID}
       GID: ${GID}
+      CIRCLECI: ${CIRCLECI:-false}
     working_dir: /var/www
     volumes:
       # We share the current folder into /var/www.  This means code changes on the host will get picked up
@@ -119,7 +118,7 @@ services:
 
   restarters_db:
     profiles: ["core", "debug", "discourse"]
-    image: mysql:5.7.33
+    image: mysql:8.0
     container_name: restarters_db
     restart: unless-stopped
     tty: true