Merge branch 'main' of github.com:fleetbase/fleetbase into cloud-qa

api/composer.json

@@ -9,11 +9,13 @@
     "license": "AGPL-3.0-or-later",
     "require": {
         "php": "^8.0",
-        "appstract/laravel-opcache": "^4.0",
-        "fleetbase/core-api": "^1.5.31",
-        "fleetbase/fleetops-api": "^0.5.24",
+        "fleetbase/core-api": "^1.5.22",
+        "fleetbase/fleetops-api": "^0.5.16",
         "fleetbase/registry-bridge": "^0.0.18",
-        "fleetbase/storefront-api": "^0.3.28",
+        "fleetbase/billing-api": "^0.1.6",
+        "fleetbase/internals-api": "^0.0.9",
+        "fleetbase/flespi-integration": "^0.1.13",
+        "fleetbase/storefront-api": "^0.3.20",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^10.0",
         "laravel/octane": "^2.3",
@@ -38,9 +40,17 @@
         "phpunit/phpunit": "^10.0"
     },
     "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/billing"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/fleetbase/internals"
+        },
         {
             "type": "composer",
-            "url": "https://registry.fleetbase.io"
+            "url": "https://registry.qa.fleetbase.io"
         }
     ],
     "autoload": {

api/config/opcache.php

@@ -1,30 +0,0 @@
-<?php
-
-return [
-    'url' => env('OPCACHE_URL', config('app.url')),
-    'prefix' => 'opcache-api',
-    'verify' => true,
-    'headers' => [],
-    'directories' => [
-        base_path('app'),
-        base_path('bootstrap'),
-        base_path('public'),
-        base_path('resources'),
-        base_path('routes'),
-        base_path('storage'),
-        base_path('vendor'),
-    ],
-    'exclude' => [
-        'test',
-        'Test',
-        'tests',
-        'Tests',
-        'stub',
-        'Stub',
-        'stubs',
-        'Stubs',
-        'dumper',
-        'Dumper',
-        'Autoload',
-    ],
-];

api/deploy.sh

@@ -26,14 +26,10 @@ php artisan schedule-monitor:sync
 
 # Clear cache
 php artisan cache:clear
-php artisan route:clear
 
 # Optimize
-php artisan config:cache
-php artisan route:cache
+# php artisan config:cache
+# php artisan route:cache
 
 # Initialize registry
 php artisan registry:init
-
-# Restart octane
-# php artisan octane:reload

console/app/router.js

@@ -55,9 +55,12 @@ Router.map(function () {
                 this.route('index', { path: '/' }, function () {
                     this.route('users', { path: '/:public_id/users' });
                 });
+<<<<<<< HEAD
+=======
             });
             this.route('schedule-monitor', function () {
                 this.route('logs', { path: '/:id/logs' });
+>>>>>>> 23d5ecfdb856aac664f6124188de619f036d825b
             });
         });
     });

console/environments/.env.production

@@ -1,8 +1,8 @@
-API_HOST=
+API_HOST=https://api.fleetbase.io
 API_NAMESPACE=int/v1
 API_SECURE=true
 SOCKETCLUSTER_PATH=/socketcluster/
-SOCKETCLUSTER_HOST=
+SOCKETCLUSTER_HOST=socket.fleetbase.io
 SOCKETCLUSTER_SECURE=true
-SOCKETCLUSTER_PORT=38000
-OSRM_HOST=https://router.project-osrm.org
+SOCKETCLUSTER_PORT=8000
+OSRM_HOST=https://router.project-osrm.org

console/environments/.env.qa

@@ -0,0 +1,9 @@
+API_HOST=https://api.qa.fleetbase.io
+API_NAMESPACE=int/v1
+API_SECURE=true
+SOCKETCLUSTER_PATH=/socketcluster/
+SOCKETCLUSTER_HOST=socket.qa.fleetbase.io
+SOCKETCLUSTER_SECURE=true
+SOCKETCLUSTER_PORT=8000
+OSRM_HOST=https://bundle.routing.fleetbase.io
+OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io

console/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/console",
-    "version": "0.5.29",
+    "version": "0.5.20",
     "private": true,
     "description": "Modular logistics and supply chain operating system (LSOS)",
     "repository": "https://github.com/fleetbase/fleetbase",
@@ -29,15 +29,18 @@
     },
     "dependencies": {
         "@ember/legacy-built-in-components": "^0.4.2",
-        "@fleetbase/dev-engine": "^0.2.9",
         "@fleetbase/ember-core": "latest",
         "@fleetbase/ember-ui": "latest",
         "@fleetbase/fleetops-data": "latest",
-        "@fleetbase/fleetops-engine": "^0.5.24",
+        "@fleetbase/fleetops-engine": "^0.5.16",
         "@fleetbase/iam-engine": "^0.1.3",
+        "@fleetbase/dev-engine": "^0.2.9",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fleetbase/registry-bridge-engine": "^0.0.18",
-        "@fleetbase/storefront-engine": "^0.3.28",
+        "@fleetbase/storefront-engine": "^0.3.20",
+        "@fleetbase/billing-engine": "^0.1.6",
+        "@fleetbase/internals-engine": "^0.0.9",
+        "@fleetbase/flespi-engine": "^0.1.13",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "ember-changeset": "^4.1.2",
         "ember-changeset-validations": "^4.1.1",

docker-compose.yml

@@ -1,11 +1,6 @@
 services:
   cache:
     image: redis:4-alpine
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
 
   database:
     image: mysql:8.0-oracle
@@ -17,11 +12,6 @@ services:
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
       MYSQL_DATABASE: "fleetbase"
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
 
   socket:
     image: socketcluster/socketcluster:v17.4.0
@@ -38,11 +28,6 @@ services:
       target: events-dev
       args:
         ENVIRONMENT: development
-    healthcheck:
-      test: ["CMD", "php", "artisan", "queue:status"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
     environment:
       DATABASE_URL: "mysql://root@database/fleetbase"
       QUEUE_CONNECTION: redis

docker/Dockerfile

@@ -129,9 +129,10 @@ CMD ["php", "artisan", "queue:work"]
 # Application dev stage
 FROM base as app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0 --watch"] 
+# Add --watch flag later
+CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --caddyfile $CADDYFILE_PATH"] 
 
 # Application stage
 FROM base as app
 ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0"]
+CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --https --http-redirect --caddyfile $CADDYFILE_PATH"]