Merge pull request #422 from fleetbase/dev-v0.7.7

v0.7.7 - Configurable rate limiting and maintenance patches

.github/workflows/publish-docker-images.yml

@@ -1,50 +1,103 @@
 name: Fleetbase Docker Images
 
 on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to build from'
-        required: false
-        default: 'main'
-      version:
-        description: 'Image version tag (e.g., v0.7.1-beta)'
-        required: false
+    push:
+        tags:
+            - 'v*'
+    workflow_dispatch:
+        inputs:
+            branch:
+                description: 'Branch to build from'
+                required: false
+                default: 'main'
+            version:
+                description: 'Image version tag (e.g., v0.7.1-beta)'
+                required: false
 
 jobs:
-  docker-release:
-    name: Build and Push Docker Images
-    runs-on: ubuntu-latest
+    docker-release:
+        name: Build and Push Docker Images
+        runs-on: ubuntu-latest
 
-    env:
-      REGISTRY: fleetbase
-      VERSION: ${{ github.event.inputs.version || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && github.ref_name) || 'manual' }}
+        env:
+            REGISTRY: fleetbase
+            VERSION: ${{ github.event.inputs.version || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && github.ref_name) || 'manual' }}
 
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.inputs.branch || github.ref_name }}
-          submodules: recursive
+        steps:
+            - name: Checkout Repo
+              uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.event.inputs.branch || github.ref_name }}
+                  submodules: recursive
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v2
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+            - name: Log in to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKER_HUB_USERNAME }}
+                  password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Build and Push Console & API Images
-        uses: docker/bake-action@v2
-        with:
-          push: true
-          targets: |
-            fleetbase-console
-            fleetbase-api
-          files: |
-            ./docker-bake.hcl
+            - name: Build and Push Console & API Images
+              uses: docker/bake-action@v2
+              with:
+                  push: true
+                  targets: |
+                      fleetbase-console
+                      fleetbase-api
+                  files: |
+                      ./docker-bake.hcl
+
+    aws-marketplace-ecr-release:
+        name: Build and Push to AWS ECR
+        runs-on: ubuntu-latest
+        needs: docker-release
+
+        env:
+            REGISTRY: ${{ secrets.AWS_ECR_REGISTRY }}/fleetbase
+            VERSION: ${{ github.event.inputs.version || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && github.ref_name) || 'manual' }}
+
+        steps:
+            - name: Checkout Repo
+              uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.event.inputs.branch || github.ref_name }}
+                  submodules: recursive
+
+            - name: Configure AWS Credentials
+              uses: aws-actions/configure-aws-credentials@v3
+              with:
+                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+                  aws-region: ${{ secrets.AWS_REGION }}
+
+            - name: Manually log in to Amazon ECR (Marketplace-style)
+              run: |
+                aws ecr get-login-password --region ${{ secrets.AWS_ECR_REGION }} | \
+                docker login --username AWS --password-stdin ${{ secrets.AWS_ECR_REGISTRY }}
+
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v2
+
+            - name: Bake and Push to ECR
+              uses: docker/bake-action@v2
+              with:
+                  push: true
+                  files: |
+                      ./docker-bake.hcl
+                  targets: |
+                      fleetbase-api
+                      fleetbase-console
+
+            - name: Verify ECR Images
+              run: |
+                  aws ecr describe-images \
+                    --registry-id ${{ secrets.AWS_ECR_REGISTRY_ID }} \
+                    --repository-name fleetbase/fleetbase-api \
+                    --region ${{ secrets.AWS_ECR_REGION }}
+
+                  aws ecr describe-images \
+                    --registry-id ${{ secrets.AWS_ECR_REGISTRY_ID }} \
+                    --repository-name fleetbase/fleetbase-console \
+                    --region ${{ secrets.AWS_ECR_REGION }}

RELEASE.md

@@ -1,16 +1,11 @@
-# 🚀 Fleetbase v0.7.4 — 2025-05-26
+# 🚀 Fleetbase v0.7.7 — 2025-08-09
 
-> “Added an official docker install script”
+> “Added ability to configure rate limiting”
 
 ---
 
 ## ✨ Highlights
-- Added logic condition property shortcuts for `pickup`, `dropoff`, and `currentWaypoint` (with aliases `waypoint` and `currentWaypointMarker`)
-
----
-
-## 🐛 Fixes
-- Patched: Saving Fleet-Ops notification settings 
+- Ability to configure rate limiting
 
 ---
 
@@ -19,13 +14,6 @@
 
 ---
 
-## 📦 How to use the new installer script
-```bash
-sh ./scripts/docker-install.sh
-```
-
----
-
 ## 🔧 Upgrade Steps
 ```bash
 # Pull latest version

api/app/Http/Kernel.php

@@ -40,7 +40,6 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
             'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],

api/app/Providers/RouteServiceProvider.php

@@ -2,10 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
@@ -17,17 +15,15 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->configureRateLimiting();
-
         $this->routes(
             function () {
                 Route::get(
-                    '/status',
-                    function () {
+                    '/health',
+                    function (Request $request) {
                         return response()->json(
                             [
                                 'status' => 'ok',
-                                'time' => microtime(true) - LARAVEL_START
+                                'time' => microtime(true) - $request->attributes->get('request_start_time')
                             ]
                         );
                     }
@@ -35,19 +31,4 @@ class RouteServiceProvider extends ServiceProvider
             }
         );
     }
-
-    /**
-     * Configure the rate limiters for the application.
-     *
-     * @return void
-     */
-    protected function configureRateLimiting()
-    {
-        RateLimiter::for(
-            'api',
-            function (Request $request) {
-                return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
-            }
-        );
-    }
 }

api/composer.json

@@ -10,8 +10,8 @@
     "require": {
         "php": "^8.0",
         "appstract/laravel-opcache": "^4.0",
-        "fleetbase/core-api": "^1.6.10",
-        "fleetbase/fleetops-api": "^0.6.12",
+        "fleetbase/core-api": "^1.6.13",
+        "fleetbase/fleetops-api": "^0.6.16",
         "fleetbase/registry-bridge": "^0.0.19",
         "fleetbase/storefront-api": "^0.4.0",
         "guzzlehttp/guzzle": "^7.0.1",

api/config/octane.php

@@ -1,5 +1,6 @@
 <?php
 
+use Fleetbase\Support\Utils;
 use Laravel\Octane\Contracts\OperationTerminated;
 use Laravel\Octane\Events\RequestHandled;
 use Laravel\Octane\Events\RequestReceived;
@@ -192,6 +193,7 @@ return [
         'routes',
         'composer.lock',
         '.env',
+        ...Utils::arrayFrom(env('OCTANE_WATCH_DIRS'))
     ],
 
     /*

console/app/instance-initializers/load-leaflet.js

@@ -14,5 +14,6 @@ export function initialize(application) {
 }
 
 export default {
+    name: 'load-leaflet',
     initialize,
 };

console/app/models/user.js

@@ -23,6 +23,7 @@ export default class UserModel extends Model {
     @attr('string') timezone;
     @attr('string') country;
     @attr('string') ip_address;
+    @attr('string') aws_customer_id;
     @attr('string') slug;
     @attr('string') role_name;
     @attr('string') type;

console/app/templates/onboard/index.hbs

@@ -35,4 +35,8 @@
             <Button @icon="check" @iconPrefix="fas" @type="primary" @size="lg" @text={{t "onboard.index.continue-button-text"}} @isLoading={{this.isLoading}} @disabled={{this.readyToSubmit}} @onClick={{this.startOnboard}} />
         </div>
     </form>
+
+    <RegistryYield @registry="onboard" as |YieldedComponent ctx|>
+        <YieldedComponent @context={{ctx}} />
+    </RegistryYield>
 </div>

console/ember-cli-build.js

@@ -53,7 +53,7 @@ module.exports = function (defaults) {
             },
             filter: {
                 enabled: true,
-                plugins: [postcssAtRulesVariables, postcssMixins, postcssEach, postcssConditionals, tailwind('./tailwind.js')],
+                plugins: [postcssAtRulesVariables, postcssMixins, postcssEach, postcssConditionals, tailwind('./tailwind.config.js')],
             },
         },
 

console/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/console",
-    "version": "0.7.4",
+    "version": "0.7.6",
     "private": true,
     "description": "Modular logistics and supply chain operating system (LSOS)",
     "repository": "https://github.com/fleetbase/fleetbase",
@@ -33,9 +33,9 @@
         "@fleetbase/ember-core": "latest",
         "@fleetbase/ember-ui": "latest",
         "@fleetbase/fleetops-data": "latest",
-        "@fleetbase/fleetops-engine": "^0.6.12",
+        "@fleetbase/fleetops-engine": "^0.6.16",
         "@fleetbase/iam-engine": "^0.1.3",
-        "@fleetbase/leaflet-routing-machine": "^3.2.16",
+        "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fleetbase/registry-bridge-engine": "^0.0.19",
         "@fleetbase/storefront-engine": "^0.4.0",
         "@fortawesome/ember-fontawesome": "^2.0.0",

console/tailwind.config.js

@@ -1,19 +1,21 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
     darkMode: ['class', '[data-theme="dark"]'],
-    content: [
-        './app/**/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-ui/addon/**/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-ui/addon/templates/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-ui/addon/templates/**/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-ui/addon/components/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-ui/addon/components/**/*.{hbs,js}',
-        './node_modules/@fleetbase/ember-core/addon/**/*.{hbs,js}',
-        './node_modules/@fleetbase/fleetops-engine/addon/**/*.{hbs,js}',
-        './node_modules/@fleetbase/storefront-engine/addon/**/*.{hbs,js}',
-        './node_modules/@fleetbase/*-engine/addon/**/*.{hbs,js}',
-        './node_modules/**/*-engine/addon/**/*.{hbs,js}',
-        '../packages/*-engine/addon/**/*.{hbs,js}',
+    content: {
+        relative: true,
+        files: [
+            './app/**/*.{hbs,js}',
+            './node_modules/.pnpm/@fleetbase+*/**/addon/**/*.{hbs,js}',
+            './node_modules/@fleetbase+*/addon/**/*.{hbs,js}',
+            './node_modules/@fleetbase/ember-ui/addon/templates/**/*.{hbs,js}',
+            './node_modules/@fleetbase/ember-ui/addon/components/**/*.{hbs,js}',
+            './node_modules/**/*-engine/addon/**/*.{hbs,js}'
+        ],
+    },
+    safelist: [
+        {
+            pattern: /(py|px|mx|my|gap)-[1-9][0-9]?/,
+        },
     ],
     theme: {
         extend: {
@@ -94,7 +96,22 @@ module.exports = {
                 86: '30rem',
             },
             spacing: {
-                70: '18rem',
+                6: '1.5rem',
+                8: '2rem',
+                10: '2.5rem',
+                12: '3rem',
+                16: '4rem',
+                20: '5rem',
+                24: '6rem',
+                32: '8rem',
+                40: '10rem',
+                44: '11rem',
+                48: '12rem',
+                52: '13rem',
+                56: '14rem',
+                60: '15rem',
+                64: '16rem',
+                72: '18rem',
                 74: '22rem',
                 78: '26rem',
                 82: '28rem',

docker-compose.yml

@@ -41,6 +41,9 @@ services:
       CACHE_PATH: /fleetbase/api/storage/framework/cache
       CACHE_URL: tcp://cache
       REDIS_URL: tcp://cache
+    depends_on:
+      - database
+      - cache
 
   queue:
     image: fleetbase/fleetbase-api:latest
@@ -57,6 +60,9 @@ services:
       CACHE_PATH: /fleetbase/api/storage/framework/cache
       CACHE_URL: tcp://cache
       REDIS_URL: tcp://cache
+    depends_on:
+        - database
+        - cache
 
   console:
     image: fleetbase/fleetbase-console:latest

docker/Dockerfile

@@ -75,7 +75,7 @@ ENV QUEUE_CONNECTION=redis
 ENV CADDYFILE_PATH=/fleetbase/Caddyfile
 ENV CONSOLE_PATH=/fleetbase/console
 ENV OCTANE_SERVER=frankenphp
-ENV FLEETBASE_VERSION=0.7.4
+ENV FLEETBASE_VERSION=0.7.7
 
 # Set environment
 ARG ENVIRONMENT=production