preparing release for 0.2.3

preparing for hotfix/critical release patches

.github/workflows/cd.yml

@@ -72,7 +72,7 @@ jobs:
       run: |-
           set -eu
           # run deploy.sh script before deployments
-          env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ./ecs-tool run --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} --task_definition ${{ env.PROJECT }}-${{ env.STACK }}-app --container_name app ./deploy.sh
+          env "ECS_RUN.SERVICE=app" "ECS_RUN.LAUNCH_TYPE=FARGATE" ./ecs-tool run -l "ecs-tool" --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} --task_definition ${{ env.PROJECT }}-${{ env.STACK }}-app --container_name app ./deploy.sh
           ./ecs-tool deploy --image_tag '{container_name}-${{ env.VERSION }}' --cluster ${{ env.PROJECT }}-${{ env.STACK }} -s app -s scheduler -s events
 
   build_frontend:
@@ -158,6 +158,10 @@ jobs:
     
     - name: Deploy Console 🚀
       run: |
-          DEPLOY_BUCKET=${{ env.PROJECT }}-${{ env.STACK }}
+          set -u
+
+          DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}
+          # this value will come from the dotenv above
+          echo "Deploying to $DEPLOY_BUCKET"
           wget -O- https://github.com/bep/s3deploy/releases/download/v2.11.0/s3deploy_2.11.0_linux-amd64.tar.gz | tar xzv -f - s3deploy
           ./s3deploy -region ${AWS_REGION} -source console/dist -bucket ${DEPLOY_BUCKET}

.gitignore

@@ -12,9 +12,14 @@ api/storage/*.key
 api/storage/uploads
 api/storage/public
 api/vendor
+api/composer.dev.json
+api/composer-install-dev.sh
 act.sh
 composer-auth.json
 packages/billing-api
 packages/billing-engine
+packages/flespi-engine
+packages/flespi-integration
+packages/projectargus-engine
 docker/database/*
 docker/database/mysql/*

api/composer-install-dev.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ -f composer.lock ]; then
-    rm composer.lock
-fi
-
-mv composer.json composer.prod.json && cp composer.dev.json composer.json && composer install && mv composer.prod.json composer.json

api/composer.dev.json

@@ -1,94 +0,0 @@
-{
-    "name": "laravel/laravel",
-    "type": "project",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
-    "license": "MIT",
-    "require": {
-        "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.2.5",
-        "fleetbase/fleetops-api": "^1.1.3",
-        "fleetbase/storefront-api": "^1.1.1",
-        "fleetbase/pallet-api": "^0.0.1",
-        "fleetbase/billing-api": "^0.0.2",
-        "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.75",
-        "laravel/sanctum": "^2.11",
-        "laravel/tinker": "^2.5",
-        "league/flysystem-aws-s3-v3": "^1.0",
-        "maatwebsite/excel": "^3.1",
-        "phpoffice/phpspreadsheet": "^1.28",
-        "predis/predis": "^2.1",
-        "psr/http-factory-implementation": "*"
-    },
-    "require-dev": {
-        "facade/ignition": "^2.5",
-        "fakerphp/faker": "^1.9.1",
-        "kitloong/laravel-migrations-generator": "^6.10",
-        "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10",
-        "phpunit/phpunit": "^9.5.10"
-    },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../packages/core-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/fleetops-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/storefront-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/pallet-api"
-        },
-        {
-            "type": "path",
-            "url": "../packages/billing-api"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "App\\": "app/",
-            "Database\\Factories\\": "database/factories/",
-            "Database\\Seeders\\": "database/seeders/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-    "scripts": {
-        "post-autoload-dump": ["Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi"],
-        "post-update-cmd": ["@php artisan vendor:publish --tag=laravel-assets --ansi --force"],
-        "post-root-package-install": ["@php -r \"file_exists('.env') || copy('.env.example', '.env');\""],
-        "post-create-project-cmd": ["@php artisan key:generate --ansi"],
-        "clear-logs": ["rm -rf storage/logs/*.log", "composer dump-autoload", "chmod -R 777 storage", "chmod -R 777 bootstrap/cache", "chmod -R 777 resources"],
-        "clean-logs": ["composer run-script clear-logs"],
-        "dock": ["docker exec -it fleetbase_os_application_1 /usr/bin/tmux -u new"],
-        "dock-server": ["docker exec -it fleetbase_os_httpd_1 /bin/sh"],
-        "tunnel": ["ngrok http --region=ap --hostname=fleetbase.ap.ngrok.io 8000"]
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "allow-plugins": {
-            "php-http/discovery": true
-        }
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}

api/composer.json

@@ -9,9 +9,9 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "fleetbase/core-api": "^1.2.5",
-        "fleetbase/fleetops-api": "^1.1.3",
-        "fleetbase/storefront-api": "^1.1.1",
+        "fleetbase/core-api": "^1.3.0",
+        "fleetbase/fleetops-api": "^1.2.0",
+        "fleetbase/storefront-api": "^1.1.2",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^8.75",

api/config/filesystems.php

@@ -39,21 +39,13 @@ return [
             'driver' => 'local',
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
-        ],
-
-        'uploads' => [
-            'driver' => 'local',
-            'root' => storage_path('app/uploads'),
-            'url' => env('APP_URL').'/uploads',
-            'visibility' => 'public',
         ],
 
         's3' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION'),
+            'region' => env('AWS_DEFAULT_REGION', 'ap-southeast-1'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),