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

v0.7.7 - Configurable rate limiting and maintenance patches

.github/workflows/build-binaries.yml

@@ -1,6 +1,7 @@
 name: Build Fleetbase Binaries
 
 on:
+  workflow_dispatch:
   workflow_run:
     workflows: ["Create Release"]
     types: [completed]
@@ -10,6 +11,7 @@ permissions:
 
 env:
   DIST_DIR: builds/dist
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   build-linux:

.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 }}

README.md

@@ -32,10 +32,7 @@ Fleetbase is a modular logistics and supply chain operating system designed to s
 
 ```bash
 git clone git@github.com:fleetbase/fleetbase.git  
-cd fleetbase  
-docker-compose up -d  
-docker exec -ti fleetbase-application-1 bash  
-sh deploy.sh
+cd fleetbase && ./scripts/docker-install.sh
 ```
 
 ## 📖 Table of contents
@@ -75,10 +72,7 @@ Make sure you have both the latest versions of docker and docker-compose install
 
 ```bash
 git clone git@github.com:fleetbase/fleetbase.git  
-cd fleetbase  
-docker-compose up -d  
-docker exec -ti fleetbase-application-1 bash  
-sh deploy.sh
+cd fleetbase && ./scripts/docker-install.sh
 ```
 
 ### Accessing Fleetbase
@@ -89,7 +83,17 @@ Fleetbase API: http://localhost:8000
 
 ### Additional Configurations
 
-**CORS:** If you’re installing directly on a server you may need to add your IP address or domain to the `api/config/cors.php` file in the `allowed_hosts` array.  
+**CORS:** If you’re installing directly on a server you will need to configure the environment variables to the application container:
+```
+CONSOLE_HOST=http://{yourhost}:4200
+```
+If you have additional applications or frontends you can use the environment variable `FRONTEND_HOSTS` to add a comma delimited list of additioal frontend hosts.
+
+**Application Key** If you get an issue about a missing application key just run:
+```bash
+docker compose exec application bash -c "php artisan key:generate --show"
+```
+Next copy this value to the `APP_KEY` environment variable in the application container and restart.
   
 **Routing:** Fleetbase ships with a default OSRM server hosted by `[router.project-osrm.org](https://router.project-osrm.org)` but you’re able to use your own or any other OSRM compatible server. You can modify this in the `console/environments` directory by modifying the .env file of the environment you’re deploying and setting the `OSRM_HOST` to the OSRM server for Fleetbase to use.  
   
@@ -100,6 +104,7 @@ version: “3.8”
 services:  
   application:  
     environment:  
+      CONSOLE_HOST: http://localhost:4200
       MAIL_MAILER: (ses, smtp, mailgun, postmark, sendgrid)
       OSRM_HOST: https://router.project-osrm.org
       IPINFO_API_KEY:
@@ -108,7 +113,6 @@ services:
       TWILIO_SID:  
       TWILIO_TOKEN:
       TWILIO_FROM:
-      CONSOLE_HOST: http://localhost:4200
 ```
 
 You can learn more about full installation, and configuration in the [official documentation](https://docs.fleetbase.io/getting-started/install).
@@ -145,9 +149,8 @@ Fleetbase offers a few open sourced apps which are built on Fleetbase which can
 ## 🛣️ Roadmap
 1.  **Inventory and Warehouse Management** ~ Pallet will be Fleetbase’s first official extension for WMS & Inventory.
 2.  **Accounting and Invoicing** ~ Ledger will be Fleetbase’s first official extension accounting and invoicing.
-3.  **Binary Builds** ~ Run Fleetbase from a single binary.
-4.  **Fleetbase for Desktop** ~ Desktop builds for OSX and Windows.
-5. **Custom Maps and Routing Engines** ~ Feature to enable easy integrations with custom maps and routing engines like Google Maps or Mapbox etc…
+3.  **Fleetbase for Desktop** ~ Desktop builds for OSX and Windows.
+4. **Custom Maps and Routing Engines** ~ Feature to enable easy integrations with custom maps and routing engines like Google Maps or Mapbox etc…
 
 ## 🪲 Bugs and 💡 Feature Requests
 

RELEASE.md

@@ -1,17 +1,11 @@
-# 🚀 Fleetbase v0.7.2 — 2025-05-23
+# 🚀 Fleetbase v0.7.7 — 2025-08-09
 
-> “Patched route optimization, telemetry, and storefront networks.”
+> “Added ability to configure rate limiting”
 
 ---
 
 ## ✨ Highlights
-- Minor tweak for Telemetry support.
-- Improved builds for `DISABLE_RUNTIME_CONFIG=true`
-- Patched and fixed OSRM route optimization
-- Patched and fixed Storefront network store management & category management
-- Upgraded `ember-basic-dropdown` and `ember-power-select` to v8
-- Upgraded `ember-concurrency` to v4.0.4
-- In process of removing `ember-concurrency-decorators`
+- Ability to configure rate limiting
 
 ---
 
@@ -20,18 +14,6 @@
 
 ---
 
-## 🆕 Features
-- **Telemetry** — tweak patch for improvement.
-- **Route Optimization** — improved route optimization on create order.
-
----
-
-## 🐛 Fixes
-- `DISABLE_RUNTIME_CONFIG` works at build time in addition to boot process.
-- OSRM route optimization fixed.
-- Edit, delete categories for network stores
-- Remove stores from network, re-assign or remove store from category
-
 ## 🔧 Upgrade Steps
 ```bash
 # Pull latest version
@@ -39,6 +21,9 @@ git pull origin main --no-rebase
 
 # Update docker
 docker compose down && docker compose up -d
+
+# Run deploy script
+docker compose exec application bash -c "./deploy.sh"
 ```
 
 ## Need help? 

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.8",
-        "fleetbase/fleetops-api": "^0.6.10",
+        "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.2",
+    "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.10",
+        "@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
@@ -67,6 +73,8 @@ services:
 
   application:
     image: fleetbase/fleetbase-api:latest
+    volumes:
+      - ./api/.env:/fleetbase/api/.env
     environment:
       ENVIRONMENT: development
       DATABASE_URL: "mysql://root@database/fleetbase"

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.2
+ENV FLEETBASE_VERSION=0.7.7
 
 # Set environment
 ARG ENVIRONMENT=production

scripts/docker-install.sh

@@ -0,0 +1,170 @@
+#!/usr/bin/env bash
+# scripts/docker-install.sh
+# Fleetbase Docker installer (dev / prod aware)
+# --------------------------------------------
+set -euo pipefail
+
+###############################################################################
+# 1. Ask for host (default: localhost)
+###############################################################################
+read -rp "Enter host or IP address to bind to [localhost]: " HOST_INPUT
+HOST=${HOST_INPUT:-localhost}
+echo "➜  Using host: $HOST"
+
+###############################################################################
+# 2. Ask for environment (development | production)
+###############################################################################
+while true; do
+  read -rp "Choose environment (development / production) [development]: " ENV_INPUT
+  ENV_INPUT=$(echo "$ENV_INPUT" | tr '[:upper:]' '[:lower:]')
+  case "$ENV_INPUT" in
+    ""|d|dev|development) ENVIRONMENT=development; break ;;
+    p|prod|production)    ENVIRONMENT=production;  break ;;
+    *) echo "Please type either 'development' or 'production'." ;;
+  esac
+done
+echo "➜  Environment: $ENVIRONMENT"
+
+USE_HTTPS=false
+APP_DEBUG=true
+SC_SECURE=false
+if [[ "$ENVIRONMENT" == "production" ]]; then
+  USE_HTTPS=true
+  APP_DEBUG=false
+  SC_SECURE=true
+fi
+
+###############################################################################
+# 3. Determine project root no matter where script is called from
+###############################################################################
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." && pwd )"
+cd "$PROJECT_ROOT"
+
+###############################################################################
+# 4. Generate a fresh Laravel APP_KEY
+###############################################################################
+if ! command -v openssl >/dev/null 2>&1; then
+  echo "✖ openssl is required but not found. Install it and retry." >&2
+  exit 1
+fi
+APP_KEY="base64:$(openssl rand -base64 32 | tr -d '\n')"
+echo "✔  Generated APP_KEY"
+
+###############################################################################
+# 5. Ensure docker‑compose.override.yml is present & updated
+###############################################################################
+OVERRIDE_FILE="docker-compose.override.yml"
+
+# url helpers
+SCHEME_API=$([[ "$USE_HTTPS" == true ]] && echo "https" || echo "http")
+SCHEME_CONSOLE=$([[ "$USE_HTTPS" == true ]] && echo "https" || echo "http")
+
+update_override_with_yq() {
+  yq -i "
+    .services.application.environment.APP_KEY         = \"$APP_KEY\" |
+    .services.application.environment.CONSOLE_HOST    = \"$SCHEME_CONSOLE://$HOST:4200\" |
+    .services.application.environment.ENVIRONMENT     = \"$ENVIRONMENT\" |
+    .services.application.environment.APP_DEBUG       = \"$APP_DEBUG\"
+  " "$OVERRIDE_FILE"
+  echo "✔  $OVERRIDE_FILE updated (yq)"
+}
+
+create_override() {
+  cat > "$OVERRIDE_FILE" <<YML
+services:
+  application:
+    environment:
+      APP_KEY: "$APP_KEY"
+      CONSOLE_HOST: "$SCHEME_CONSOLE://$HOST:4200"
+      ENVIRONMENT: "$ENVIRONMENT"
+      APP_DEBUG: "$APP_DEBUG"
+YML
+  echo "✔  $OVERRIDE_FILE written"
+}
+
+if [[ -f "$OVERRIDE_FILE" ]]; then
+  if command -v yq >/dev/null 2>&1; then
+    update_override_with_yq
+  else
+    cp "$OVERRIDE_FILE" "${OVERRIDE_FILE}.bak.$(date +%Y%m%d%H%M%S)"
+    echo "ℹ︎  Existing $OVERRIDE_FILE backed up (no yq found — recreating)"
+    create_override
+  fi
+else
+  create_override
+fi
+
+###############################################################################
+# 6. Write console/fleetbase.config.json atomically
+###############################################################################
+CONFIG_DIR="console"
+CONFIG_PATH="$CONFIG_DIR/fleetbase.config.json"
+mkdir -p "$CONFIG_DIR"
+
+cat > "${CONFIG_PATH}.tmp" <<JSON
+{
+  "API_HOST": "$SCHEME_API://$HOST:8000",
+  "SOCKETCLUSTER_HOST": "$HOST",
+  "SOCKETCLUSTER_PORT": "38000",
+  "SOCKETCLUSTER_SECURE": "$SC_SECURE"
+}
+JSON
+mv -f "${CONFIG_PATH}.tmp" "$CONFIG_PATH"
+echo "✔  $CONFIG_PATH updated"
+
+###############################################################################
+# 7. Start stack, wait for DB, then run deploy
+###############################################################################
+echo "⏳  Starting Fleetbase containers..."
+docker compose up -d
+
+###############################################################################
+# 7a. Wait for the database container to be ready
+###############################################################################
+DB_SERVICE="database"     # ← change if your docker‑compose uses a different name
+DB_WAIT_TIMEOUT=60        # seconds
+
+echo "⏳  Waiting for “$DB_SERVICE” to become ready (timeout: ${DB_WAIT_TIMEOUT}s)…"
+DB_CONTAINER=$(docker compose ps -q "$DB_SERVICE")
+
+if [ -z "$DB_CONTAINER" ]; then
+  echo "✖  Cannot find a running container for service \"$DB_SERVICE\". Check docker‑compose.yml."
+  exit 1
+fi
+
+# If the service defines a HEALTHCHECK we can rely on it…
+if docker inspect -f '{{.State.Health.Status}}' "$DB_CONTAINER" &>/dev/null; then
+  SECONDS=0
+  until [ "$(docker inspect -f '{{.State.Health.Status}}' "$DB_CONTAINER")" = "healthy" ]; do
+    if [ "$SECONDS" -ge "$DB_WAIT_TIMEOUT" ]; then
+      echo "✖  Timed out waiting for the database to become healthy."
+      exit 1
+    fi
+    sleep 2
+  done
+  sleep 12
+else
+  # Fallback: use mysqladmin ping (works for MySQL / MariaDB)
+  SECONDS=0
+  until docker compose exec "$DB_SERVICE" sh -c "mysqladmin --silent --wait=1 -uroot -h127.0.0.1 ping" &>/dev/null; do
+    if [ "$SECONDS" -ge "$DB_WAIT_TIMEOUT" ]; then
+      echo "✖  Timed out waiting for the database to accept connections."
+      exit 1
+    fi
+    sleep 2
+  done
+fi
+echo "✔  Database is ready."
+
+###############################################################################
+# 7b. Run the deploy script inside the application container
+###############################################################################
+echo "⏳  Running deploy script inside the application container..."
+docker compose exec application bash -c "./deploy.sh"
+docker compose up -d
+
+echo
+echo "🏁  Fleetbase is up!"
+printf "    API     → %s://%s:8000\n"    "$SCHEME_API"     "$HOST"
+printf "    Console → %s://%s:4200\n\n" "$SCHEME_CONSOLE" "$HOST"

scripts/install-packages.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Find the root directory of your repository
-root_dir=$(git rev-parse --show-toplevel)
-
-# Check if the packages directory exists
-packages_dir="$root_dir/packages"
-if [ ! -d "$packages_dir" ]; then
-    echo "Packages directory not found."
-    exit 1
-fi
-
-# Initialize flags
-remove_lock=false
-remove_modules=false
-
-for arg in "$@"
-do
-    case $arg in
-        --remove-lock)
-            remove_lock=true
-            ;;
-        --remove-modules)
-            remove_modules=true
-            ;;
-    esac
-done
-
-# Navigate to the packages directory
-cd "$packages_dir"
-
-# Find all child directories and run pnpm install if package.json exists
-for dir in */; do
-    if [[ -f "${dir}package.json" ]]; then
-        echo "Running pnpm install in $dir"
-
-        # Remove pnpm-lock.yaml if the option is set
-        if [ "$remove_lock" = true ] && [ -f "${dir}pnpm-lock.yaml" ]; then
-            echo "Removing pnpm-lock.yaml in $dir"
-            rm "${dir}pnpm-lock.yaml"
-        fi
-
-        # Remove ./node_modules if the option is set
-        if [ "$remove_modules" = true ] && [ -d "${dir}node_modules" ]; then
-            echo "Removing /node_modules in $dir"
-            rm -rf "${dir}node_modules"
-        fi
-
-        cd "$dir"
-        pnpm install
-        cd "$packages_dir" # Go back to the packages directory
-    else
-        echo "No package.json found in $dir, skipping..."
-    fi
-done

scripts/update.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Exit the script as soon as a command fails
-set -e
-
-echo "Switching to the main branch..."
-# git checkout main
-
-echo "Updating submodules..."
-git submodule update --init --recursive
-
-echo "Updating console..."
-cd console
-git checkout main
-git pull
-cd ..
-
-echo "Building Docker images..."
-docker-compose build console
-docker-compose build application
-
-echo "Update completed. Run \`docker-compose up -d\` to launch!"