Merge branch 'feature/caddy-server' of github.com:fleetbase/fleetbase into feature/caddy-server

2026-01-08 07:16:49 +00:00 · 2024-02-06 15:18:25 +08:00
parent 58600a357a 26509008dc
commit e588242cb9
13 changed files with 320 additions and 393 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,6 +14,7 @@ concourse/
 infra/*
 vagrant/*
 docker/Dockerfile
+docker/database/
 deploy/*
 media/*
 data/*
@@ -23,4 +24,4 @@ docker-compose-prod.yml
 docker-compose.yml
 $virtualenv.tar.gz
 $node_modules.tar.gz
-docker-compose.override.yml
+docker-compose.override.yml
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -2,14 +2,15 @@ name: Fleetbase CI/CD

 on:
  push:
-    branches: [ "deploy/*" ]
+    branches: ["deploy/*"]

 concurrency:
-    group: ${{ github.ref }}
-    cancel-in-progress: true
+  group: ${{ github.ref }}
+  cancel-in-progress: true

 env:
  PROJECT: ${{ secrets.PROJECT }}
+  GITHUB_AUTH_KEY: ${{ secrets._GITHUB_AUTH_TOKEN }}

 jobs:
  build_service:
@@ -17,59 +18,52 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      id-token: write # This is required for requesting the JWT
-      contents: read  # This is required for actions/checkout
+      contents: read # This is required for actions/checkout

    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          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: Set Dynamic ENV Vars
-      run: |
+      - name: Set Dynamic ENV Vars
+        run: |
          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV

-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
-        role-session-name: github
-        aws-region: ${{ secrets.AWS_REGION }}
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}

-    - name: Login to Amazon ECR
-      id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1

-    - name: Prepare Composer Auth Secret
-      run: |
-        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
-          echo '{"github-oauth": {"github.com": "'${{ secrets._GITHUB_AUTH_TOKEN }}'"}}' > composer-auth.json
-        else
-          echo '{}' > composer-auth.json
-        fi
+      - name: Build and Release
+        uses: docker/bake-action@v2
+        env:
+          REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
+          VERSION: ${{ env.VERSION }}
+          GITHUB_AUTH_KEY: ${{ env.GITHUB_AUTH_KEY }}
+          CACHE: type=gha
+        with:
+          push: true
+          files: |
+            ./docker-bake.hcl

-    - name: Build and Release
-      uses: docker/bake-action@v2
-      env: 
-        REGISTRY: ${{ steps.login-ecr.outputs.registry }}/${{ env.PROJECT }}-${{ env.STACK }}
-        VERSION: ${{ env.VERSION }}
-        CACHE: type=gha
-      with:
-        push: true
-        files: |
-          ./docker-bake.hcl
-
-    - name: Download ecs-tool
-      run: |
+      - name: Download ecs-tool
+        run: |
          wget -O ecs-tool.tar.gz https://github.com/springload/ecs-tool/releases/download/1.9.6/ecs-tool_1.9.6_linux_amd64.tar.gz && tar -xvf ecs-tool.tar.gz ecs-tool
-    
-    - name: Deploy the images 🚀
-      run: |-
+
+      - name: Deploy the images 🚀
+        run: |-
          set -eu
          # run deploy.sh script before deployments
          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
@@ -81,29 +75,29 @@ jobs:
    runs-on: ubuntu-latest
    permissions:
      id-token: write # This is required for requesting the JWT
-      contents: read  # This is required for actions/checkout
+      contents: read # This is required for actions/checkout

    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: true
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true

-    - name: Set Dynamic ENV Vars
-      run: |
+      - name: Set Dynamic ENV Vars
+        run: |
          SHORT_COMMIT=$(echo $GITHUB_SHA | cut -c -8)
          echo "VERSION=${SHORT_COMMIT}" >> $GITHUB_ENV
          echo "STACK=$(basename $GITHUB_REF)" >> $GITHUB_ENV

-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
-        role-session-name: github
-        aws-region: ${{ secrets.AWS_REGION }}
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_NUMBER }}:role/${{ env.PROJECT }}-${{ env.STACK }}-deployer
+          role-session-name: github
+          aws-region: ${{ secrets.AWS_REGION }}

-    - name: Get infra-provided configuration
-      run: |
+      - name: Get infra-provided configuration
+        run: |
          set -eu

          wget -O- https://github.com/springload/ssm-parent/releases/download/1.8.0/ssm-parent_1.8.0_linux_amd64.tar.gz | tar xvzf - ssm-parent
@@ -112,52 +106,52 @@ jobs:
          # remove double quotes and pipe into the env
          cat /tmp/dotenv.file | sed -e 's/"//g' >> $GITHUB_ENV

-    - name: Install Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16

-    - uses: pnpm/action-setup@v2
-      name: Install pnpm
-      id: pnpm-install
-      with:
-        version: 8
-        run_install: false
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false

-    - name: Get pnpm Store Directory
-      id: pnpm-cache
-      shell: bash
-      run: |
-        echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - name: Get pnpm Store Directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT

-    - uses: actions/cache@v3
-      name: Setup pnpm Cache
-      with:
-        path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-store-
+      - uses: actions/cache@v3
+        name: Setup pnpm Cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-

-    - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
-      run: |
-        if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
-        fi
-      working-directory: ./console
+      - name: Check for _GITHUB_AUTH_TOKEN and create .npmrc
+        run: |
+          if [[ -n "${{ secrets._GITHUB_AUTH_TOKEN }}" ]]; then
+            echo "//npm.pkg.github.com/:_authToken=${{ secrets._GITHUB_AUTH_TOKEN }}" > .npmrc
+          fi
+        working-directory: ./console

-    - name: Install dependencies
-      run: pnpm install
-      working-directory: ./console
+      - name: Install dependencies
+        run: pnpm install
+        working-directory: ./console

-    - name: Build
-      run: |
-        set -eu
+      - name: Build
+        run: |
+          set -eu

-        pnpm build
-      working-directory: ./console
-    
-    - name: Deploy Console 🚀
-      run: |
+          pnpm build
+        working-directory: ./console
+
+      - name: Deploy Console 🚀
+        run: |
          set -u

          DEPLOY_BUCKET=${STATIC_DEPLOY_BUCKET:-${{ env.PROJECT }}-${{ env.STACK }}}
--- a/2
+++ b/2
@@ -3,7 +3,7 @@
 	order php_server before file_server
 }

-http://localhost:8000 {
+http://:8000 {
 	root * /fleetbase/api/public
 	encode zstd gzip
 	php_server {
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -136,16 +136,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.297.4",
+            "version": "3.298.3",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e9d7c0e488eaffd9232c9ff419c34c8882b379e5"
+                "reference": "70fde185df4a8dd99983a308b823991fb5b39060"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e9d7c0e488eaffd9232c9ff419c34c8882b379e5",
-                "reference": "e9d7c0e488eaffd9232c9ff419c34c8882b379e5",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/70fde185df4a8dd99983a308b823991fb5b39060",
+                "reference": "70fde185df4a8dd99983a308b823991fb5b39060",
                "shasum": ""
            },
            "require": {
@@ -225,9 +225,9 @@
            "support": {
                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.297.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.298.3"
            },
-            "time": "2024-01-30T19:05:34+00:00"
+            "time": "2024-02-05T19:05:28+00:00"
        },
        {
            "name": "aws/aws-sdk-php-laravel",
@@ -1427,27 +1427,27 @@
        },
        {
            "name": "doctrine/lexer",
-            "version": "3.0.0",
+            "version": "3.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568"
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
                "shasum": ""
            },
            "require": {
                "php": "^8.1"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^9.5",
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.5",
                "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^5.0"
+                "vimeo/psalm": "^5.21"
            },
            "type": "library",
            "autoload": {
@@ -1484,7 +1484,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/3.0.0"
+                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
            },
            "funding": [
                {
@@ -1500,7 +1500,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-12-15T16:57:16+00:00"
+            "time": "2024-02-05T11:56:58+00:00"
        },
        {
            "name": "dompdf/dompdf",
@@ -1947,18 +1947,18 @@
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/core-api.git",
-                "reference": "2ca42dbeb801343be9ec7611e3e76a670f0c7b39"
+                "reference": "ff8721c419c3ade4445a1fa5506a2cd8ee837632"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/2ca42dbeb801343be9ec7611e3e76a670f0c7b39",
-                "reference": "2ca42dbeb801343be9ec7611e3e76a670f0c7b39",
+                "url": "https://api.github.com/repos/fleetbase/core-api/zipball/ff8721c419c3ade4445a1fa5506a2cd8ee837632",
+                "reference": "ff8721c419c3ade4445a1fa5506a2cd8ee837632",
                "shasum": ""
            },
            "require": {
                "aloha/twilio": "^5.0",
                "aws/aws-sdk-php-laravel": "^3.7",
-                "fleetbase/laravel-mysql-spatial": "^1.0.1",
+                "fleetbase/laravel-mysql-spatial": "^1.0.2",
                "giggsey/libphonenumber-for-php": "^8.13",
                "guzzlehttp/guzzle": "^7.4",
                "hammerstone/fast-paginate": "^1.0",
@@ -2053,7 +2053,7 @@
                "source": "https://github.com/fleetbase/core-api/tree/feature/upgrade-laravel-10x",
                "issues": "https://github.com/fleetbase/core-api/issues"
            },
-            "time": "2024-01-31T09:01:16+00:00"
+            "time": "2024-02-06T06:25:49+00:00"
        },
        {
            "name": "fleetbase/fleetops-api",
@@ -2061,12 +2061,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/fleetops.git",
-                "reference": "b72f1e6e6aa52c726249e7c04782a8c5a911cfa3"
+                "reference": "b26ec50dd37f29b1f20bdabd4845e60d8733d7cf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/b72f1e6e6aa52c726249e7c04782a8c5a911cfa3",
-                "reference": "b72f1e6e6aa52c726249e7c04782a8c5a911cfa3",
+                "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/b26ec50dd37f29b1f20bdabd4845e60d8733d7cf",
+                "reference": "b26ec50dd37f29b1f20bdabd4845e60d8733d7cf",
                "shasum": ""
            },
            "require": {
@@ -2164,20 +2164,20 @@
                "source": "https://github.com/fleetbase/fleetops/tree/feature/upgrade-laravel-10x",
                "issues": "https://github.com/fleetbase/fleetops/issues"
            },
-            "time": "2024-01-31T09:21:16+00:00"
+            "time": "2024-02-06T06:20:01+00:00"
        },
        {
            "name": "fleetbase/laravel-mysql-spatial",
-            "version": "1.0.1",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/laravel-mysql-spatial.git",
-                "reference": "f55bea7f0f26d7c06a97769a66671fa54bf9aff8"
+                "reference": "72bb675f5fa700f123f0990f501a9e3e038b6f7a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/laravel-mysql-spatial/zipball/f55bea7f0f26d7c06a97769a66671fa54bf9aff8",
-                "reference": "f55bea7f0f26d7c06a97769a66671fa54bf9aff8",
+                "url": "https://api.github.com/repos/fleetbase/laravel-mysql-spatial/zipball/72bb675f5fa700f123f0990f501a9e3e038b6f7a",
+                "reference": "72bb675f5fa700f123f0990f501a9e3e038b6f7a",
                "shasum": ""
            },
            "require": {
@@ -2225,9 +2225,9 @@
            "description": "MySQL spatial data types extension for Laravel x Fleetbase.",
            "support": {
                "issues": "https://github.com/fleetbase/laravel-mysql-spatial/issues",
-                "source": "https://github.com/fleetbase/laravel-mysql-spatial/tree/v1.0.1"
+                "source": "https://github.com/fleetbase/laravel-mysql-spatial/tree/v1.0.2"
            },
-            "time": "2024-01-30T02:44:57+00:00"
+            "time": "2024-02-06T06:14:18+00:00"
        },
        {
            "name": "fleetbase/storefront-api",
@@ -2235,12 +2235,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/fleetbase/storefront.git",
-                "reference": "60cef55385e73e47f7303b7200388089222c4e14"
+                "reference": "0b68ee25d61c70e7cefde702bc7242313846ac40"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/60cef55385e73e47f7303b7200388089222c4e14",
-                "reference": "60cef55385e73e47f7303b7200388089222c4e14",
+                "url": "https://api.github.com/repos/fleetbase/storefront/zipball/0b68ee25d61c70e7cefde702bc7242313846ac40",
+                "reference": "0b68ee25d61c70e7cefde702bc7242313846ac40",
                "shasum": ""
            },
            "require": {
@@ -2331,7 +2331,7 @@
                "source": "https://github.com/fleetbase/storefront/tree/feature/upgrade-laravel-10x",
                "issues": "https://github.com/fleetbase/storefront/issues"
            },
-            "time": "2024-01-31T09:25:07+00:00"
+            "time": "2024-02-06T06:20:57+00:00"
        },
        {
            "name": "fruitcake/php-cors",
@@ -5441,16 +5441,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "2.4.1",
+            "version": "2.4.2",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5"
+                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
-                "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
                "shasum": ""
            },
            "require": {
@@ -5463,7 +5463,7 @@
            },
            "require-dev": {
                "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.0",
+                "commonmark/cmark": "0.30.3",
                "commonmark/commonmark.js": "0.30.0",
                "composer/package-versions-deprecated": "^1.8",
                "embed/embed": "^4.4",
@@ -5473,10 +5473,10 @@
                "michelf/php-markdown": "^1.4 || ^2.0",
                "nyholm/psr7": "^1.5",
                "phpstan/phpstan": "^1.8.2",
-                "phpunit/phpunit": "^9.5.21",
+                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
                "unleashedtech/php-coding-standard": "^3.1.1",
                "vimeo/psalm": "^4.24.0 || ^5.0.0"
            },
@@ -5543,7 +5543,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-30T16:55:00+00:00"
+            "time": "2024-02-02T11:59:32+00:00"
        },
        {
            "name": "league/config",
@@ -5629,16 +5629,16 @@
        },
        {
            "name": "league/flysystem",
-            "version": "3.23.1",
+            "version": "3.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e"
+                "reference": "b25a361508c407563b34fac6f64a8a17a8819675"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e",
-                "reference": "199e1aebbe3e62bd39f4d4fc8c61ce0b3786197e",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675",
+                "reference": "b25a361508c407563b34fac6f64a8a17a8819675",
                "shasum": ""
            },
            "require": {
@@ -5658,7 +5658,7 @@
            "require-dev": {
                "async-aws/s3": "^1.5 || ^2.0",
                "async-aws/simple-s3": "^1.1 || ^2.0",
-                "aws/aws-sdk-php": "^3.220.0",
+                "aws/aws-sdk-php": "^3.295.10",
                "composer/semver": "^3.0",
                "ext-fileinfo": "*",
                "ext-ftp": "*",
@@ -5669,7 +5669,7 @@
                "phpseclib/phpseclib": "^3.0.34",
                "phpstan/phpstan": "^1.10",
                "phpunit/phpunit": "^9.5.11|^10.0",
-                "sabre/dav": "^4.3.1"
+                "sabre/dav": "^4.6.0"
            },
            "type": "library",
            "autoload": {
@@ -5703,7 +5703,7 @@
            ],
            "support": {
                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.23.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.24.0"
            },
            "funding": [
                {
@@ -5715,24 +5715,24 @@
                    "type": "github"
                }
            ],
-            "time": "2024-01-26T18:42:03+00:00"
+            "time": "2024-02-04T12:10:17+00:00"
        },
        {
            "name": "league/flysystem-aws-s3-v3",
-            "version": "3.23.1",
+            "version": "3.24.0",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240"
+                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240",
-                "reference": "97728e7a0d40ec9c6147eb0f4ee4cdc6ff0a8240",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
+                "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
                "shasum": ""
            },
            "require": {
-                "aws/aws-sdk-php": "^3.220.0",
+                "aws/aws-sdk-php": "^3.295.10",
                "league/flysystem": "^3.10.0",
                "league/mime-type-detection": "^1.0.0",
                "php": "^8.0.2"
@@ -5768,8 +5768,7 @@
                "storage"
            ],
            "support": {
-                "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.23.1"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0"
            },
            "funding": [
                {
@@ -5781,7 +5780,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-01-26T18:25:23+00:00"
+            "time": "2024-01-26T18:43:21+00:00"
        },
        {
            "name": "league/flysystem-local",
@@ -7313,16 +7312,16 @@
        },
        {
            "name": "phenx/php-font-lib",
-            "version": "0.5.5",
+            "version": "0.5.6",
            "source": {
                "type": "git",
                "url": "https://github.com/dompdf/php-font-lib.git",
-                "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8"
+                "reference": "a1681e9793040740a405ac5b189275059e2a9863"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/671df0f3516252011aa94f9e8e3b3b66199339f8",
-                "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
+                "reference": "a1681e9793040740a405ac5b189275059e2a9863",
                "shasum": ""
            },
            "require": {
@@ -7351,9 +7350,9 @@
            "homepage": "https://github.com/PhenX/php-font-lib",
            "support": {
                "issues": "https://github.com/dompdf/php-font-lib/issues",
-                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.5"
+                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6"
            },
-            "time": "2024-01-07T18:13:29+00:00"
+            "time": "2024-01-29T14:45:26+00:00"
        },
        {
            "name": "phenx/php-svg-lib",
@@ -10187,20 +10186,20 @@
        },
        {
            "name": "spomky-labs/pki-framework",
-            "version": "1.1.0",
+            "version": "1.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/Spomky-Labs/pki-framework.git",
-                "reference": "d3ba688bf40e7c6e0dabf065ee18fc210734e760"
+                "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/d3ba688bf40e7c6e0dabf065ee18fc210734e760",
-                "reference": "d3ba688bf40e7c6e0dabf065ee18fc210734e760",
+                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/86102bdd19379b2c6e5b0feb94fd490d40e7d133",
+                "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.10 || ^0.11",
+                "brick/math": "^0.10|^0.11|^0.12",
                "ext-mbstring": "*",
                "php": ">=8.1"
            },
@@ -10208,20 +10207,21 @@
                "ekino/phpstan-banned-code": "^1.0",
                "ext-gmp": "*",
                "ext-openssl": "*",
-                "infection/infection": "^0.26",
+                "infection/infection": "^0.27",
                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/extension-installer": "^1.3",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-beberlei-assert": "^1.0",
                "phpstan/phpstan-deprecation-rules": "^1.0",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^10.0",
-                "rector/rector": "^0.15",
+                "phpunit/phpunit": "^10.1",
+                "rector/rector": "^0.19",
                "roave/security-advisories": "dev-latest",
-                "symfony/phpunit-bridge": "^6.1",
-                "symfony/var-dumper": "^6.1",
-                "symplify/easy-coding-standard": "^11.1",
-                "thecodingmachine/phpstan-safe-rule": "^1.2"
+                "symfony/phpunit-bridge": "^6.4|^7.0",
+                "symfony/string": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0",
+                "symplify/easy-coding-standard": "^12.0"
            },
            "suggest": {
                "ext-bcmath": "For better performance (or GMP)",
@@ -10281,7 +10281,7 @@
            ],
            "support": {
                "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
-                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.1.0"
+                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.1.1"
            },
            "funding": [
                {
@@ -10293,7 +10293,7 @@
                    "type": "patreon"
                }
            ],
-            "time": "2023-02-13T17:21:24+00:00"
+            "time": "2024-02-05T20:37:46+00:00"
        },
        {
            "name": "sqids/sqids",
@@ -11469,16 +11469,16 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                "shasum": ""
            },
            "require": {
@@ -11492,9 +11492,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11531,7 +11528,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11547,20 +11544,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                "shasum": ""
            },
            "require": {
@@ -11571,9 +11568,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11612,7 +11606,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11628,20 +11622,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                "shasum": ""
            },
            "require": {
@@ -11654,9 +11648,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11699,7 +11690,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11715,20 +11706,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:30:37+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                "shasum": ""
            },
            "require": {
@@ -11739,9 +11730,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11783,7 +11771,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11799,20 +11787,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                "shasum": ""
            },
            "require": {
@@ -11826,9 +11814,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11866,7 +11851,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11882,20 +11867,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                "shasum": ""
            },
            "require": {
@@ -11903,9 +11888,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -11942,7 +11924,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
            },
            "funding": [
                {
@@ -11958,20 +11940,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                "shasum": ""
            },
            "require": {
@@ -11979,9 +11961,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -12025,7 +12004,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
            },
            "funding": [
                {
@@ -12041,20 +12020,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php83",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11"
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
-                "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff",
+                "reference": "86fcae159633351e5fd145d1c47de6c528f8caff",
                "shasum": ""
            },
            "require": {
@@ -12063,9 +12042,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -12105,7 +12081,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0"
            },
            "funding": [
                {
@@ -12121,20 +12097,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-16T06:22:46+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-uuid",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e"
+                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e",
-                "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853",
+                "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853",
                "shasum": ""
            },
            "require": {
@@ -12148,9 +12124,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -12187,7 +12160,7 @@
                "uuid"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0"
            },
            "funding": [
                {
@@ -12203,7 +12176,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/process",
@@ -14215,16 +14188,16 @@
        },
        {
            "name": "doctrine/dbal",
-            "version": "3.8.0",
+            "version": "3.8.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9"
+                "reference": "c9ea252cdce4da324ede3d6c5913dd89f769afd2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/d244f2e6e6bf32bff5174e6729b57214923ecec9",
-                "reference": "d244f2e6e6bf32bff5174e6729b57214923ecec9",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/c9ea252cdce4da324ede3d6c5913dd89f769afd2",
+                "reference": "c9ea252cdce4da324ede3d6c5913dd89f769afd2",
                "shasum": ""
            },
            "require": {
@@ -14240,9 +14213,9 @@
                "doctrine/coding-standard": "12.0.0",
                "fig/log-test": "^1",
                "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.56",
+                "phpstan/phpstan": "1.10.57",
                "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.15",
+                "phpunit/phpunit": "9.6.16",
                "psalm/plugin-phpunit": "0.18.4",
                "slevomat/coding-standard": "8.13.1",
                "squizlabs/php_codesniffer": "3.8.1",
@@ -14308,7 +14281,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.0"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.1"
            },
            "funding": [
                {
@@ -14324,7 +14297,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-25T21:44:02+00:00"
+            "time": "2024-02-03T17:33:49+00:00"
        },
        {
            "name": "doctrine/deprecations",
@@ -15524,16 +15497,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.9",
+            "version": "10.5.10",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
+                "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
-                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50b8e314b6d0dd06521dc31d1abffa73f25f850c",
+                "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c",
                "shasum": ""
            },
            "require": {
@@ -15605,7 +15578,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.10"
            },
            "funding": [
                {
@@ -15621,7 +15594,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-22T14:35:40+00:00"
+            "time": "2024-02-04T09:07:51+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -16602,21 +16575,20 @@
        },
        {
            "name": "spatie/flare-client-php",
-            "version": "1.4.3",
+            "version": "1.4.4",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec"
+                "reference": "17082e780752d346c2db12ef5d6bee8e835e399c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec",
-                "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/17082e780752d346c2db12ef5d6bee8e835e399c",
+                "reference": "17082e780752d346c2db12ef5d6bee8e835e399c",
                "shasum": ""
            },
            "require": {
                "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0",
-                "nesbot/carbon": "^2.62.1",
                "php": "^8.0",
                "spatie/backtrace": "^1.5.2",
                "symfony/http-foundation": "^5.2|^6.0|^7.0",
@@ -16660,7 +16632,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.4.3"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.4.4"
            },
            "funding": [
                {
@@ -16668,7 +16640,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-10-17T15:54:07+00:00"
+            "time": "2024-01-31T14:18:45+00:00"
        },
        {
            "name": "spatie/ignition",
--- a/api/deploy.sh
+++ b/api/deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 # Exit the script as soon as a command fails
 set -e
@@ -16,4 +16,4 @@ php artisan sandbox:migrate --force
 php artisan fleetbase:seed

 # Restart queue
-php artisan queue:restart
+php artisan queue:restart
--- a/console/package.json
+++ b/console/package.json
@@ -30,7 +30,7 @@
    "dependencies": {
        "@fleetbase/ember-core": "^0.2.1",
        "@fleetbase/ember-ui": "^0.2.10",
-        "@fleetbase/storefront-engine": "link:../packages/storefront",
+        "@fleetbase/storefront-engine": "^0.2.9",
        "@fleetbase/fleetops-engine": "^0.4.4",
        "@fleetbase/fleetops-data": "^0.1.8",
        "@fleetbase/dev-engine": "^0.2.1",
--- a/console/pnpm-lock.yaml
+++ b/console/pnpm-lock.yaml
@@ -2134,7 +2134,7 @@ packages:
      '@ember/edition-utils': 1.2.0
      '@ember/string': 3.1.1
      '@embroider/macros': 1.13.4
-      ember-auto-import: 2.6.3(webpack@5.89.0)
+      ember-auto-import: 2.7.2(webpack@5.89.0)
      ember-cli-babel: 7.26.11
    transitivePeerDependencies:
      - '@glint/template'
@@ -2663,7 +2663,7 @@ packages:
    dependencies:
      '@babel/core': 7.23.2
      date-fns: 2.30.0
-      ember-auto-import: 2.6.3(webpack@5.89.0)
+      ember-auto-import: 2.7.2(webpack@5.89.0)
      ember-cli-babel: 8.2.0(@babel/core@7.23.2)
      ember-cli-htmlbars: 6.3.0
      ember-cli-notifications: 9.0.0
@@ -6873,13 +6873,13 @@ packages:
    peerDependencies:
      webpack: ^4.27.0 || ^5.0.0
    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
+      icss-utils: 5.1.0(postcss@8.4.33)
      loader-utils: 2.0.4
-      postcss: 8.4.21
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.21)
-      postcss-modules-local-by-default: 4.0.4(postcss@8.4.21)
-      postcss-modules-scope: 3.1.1(postcss@8.4.21)
-      postcss-modules-values: 4.0.0(postcss@8.4.21)
+      postcss: 8.4.33
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.33)
+      postcss-modules-local-by-default: 4.0.4(postcss@8.4.33)
+      postcss-modules-scope: 3.1.1(postcss@8.4.33)
+      postcss-modules-values: 4.0.0(postcss@8.4.33)
      postcss-value-parser: 4.2.0
      schema-utils: 3.3.0
      semver: 7.5.4
@@ -7393,7 +7393,6 @@ packages:
      - '@glint/template'
      - supports-color
      - webpack
-    dev: false

  /ember-basic-dropdown@6.0.2(@babel/core@7.23.2)(ember-source@5.4.0):
    resolution: {integrity: sha512-JgI/cy7eS/Y2WoQl7B2Mko/1aFTAlxr5d+KpQeH7rBKOFml7IQtLvhiDQrpU/FLkrQ9aLNEJtzwtDZV1xQxAKA==}
@@ -8163,7 +8162,7 @@ packages:
      '@babel/core': 7.23.2
      '@ember/render-modifiers': 2.1.0(@babel/core@7.23.2)(ember-source@5.4.0)
      '@glimmer/component': 1.1.2(@babel/core@7.23.2)
-      ember-auto-import: 2.6.3(webpack@5.89.0)
+      ember-auto-import: 2.7.2(webpack@5.89.0)
      ember-cli-babel: 8.2.0(@babel/core@7.23.2)
      ember-cli-htmlbars: 6.3.0
      ember-element-helper: 0.8.5(ember-source@5.4.0)
@@ -10996,13 +10995,13 @@ packages:
      safer-buffer: 2.1.2
    dev: true

-  /icss-utils@5.1.0(postcss@8.4.21):
+  /icss-utils@5.1.0(postcss@8.4.33):
    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
    engines: {node: ^10 || ^12 || >= 14}
    peerDependencies:
      postcss: ^8.1.0
    dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.33

  /ieee754@1.2.1:
    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
@@ -13651,42 +13650,42 @@ packages:
      postcss-simple-vars: 7.0.0(postcss@8.4.21)
      sugarss: 4.0.1(postcss@8.4.21)

-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.21):
+  /postcss-modules-extract-imports@3.0.0(postcss@8.4.33):
    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
    engines: {node: ^10 || ^12 || >= 14}
    peerDependencies:
      postcss: ^8.1.0
    dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.33

-  /postcss-modules-local-by-default@4.0.4(postcss@8.4.21):
+  /postcss-modules-local-by-default@4.0.4(postcss@8.4.33):
    resolution: {integrity: sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==}
    engines: {node: ^10 || ^12 || >= 14}
    peerDependencies:
      postcss: ^8.1.0
    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
+      icss-utils: 5.1.0(postcss@8.4.33)
+      postcss: 8.4.33
      postcss-selector-parser: 6.0.15
      postcss-value-parser: 4.2.0

-  /postcss-modules-scope@3.1.1(postcss@8.4.21):
+  /postcss-modules-scope@3.1.1(postcss@8.4.33):
    resolution: {integrity: sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==}
    engines: {node: ^10 || ^12 || >= 14}
    peerDependencies:
      postcss: ^8.1.0
    dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.33
      postcss-selector-parser: 6.0.15

-  /postcss-modules-values@4.0.0(postcss@8.4.21):
+  /postcss-modules-values@4.0.0(postcss@8.4.33):
    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
    engines: {node: ^10 || ^12 || >= 14}
    peerDependencies:
      postcss: ^8.1.0
    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
+      icss-utils: 5.1.0(postcss@8.4.33)
+      postcss: 8.4.33

  /postcss-nested@5.0.6(postcss@8.4.21):
    resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
@@ -14028,7 +14027,6 @@ packages:
      nanoid: 3.3.7
      picocolors: 1.0.0
      source-map-js: 1.0.2
-    dev: true

  /preact@10.12.1:
    resolution: {integrity: sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==}
@@ -15165,7 +15163,7 @@ packages:
      stream-demux: 8.1.0
      uuid: 8.3.2
      vinyl-buffer: 1.0.1
-      ws: 8.16.0
+      ws: 8.11.0
    transitivePeerDependencies:
      - bufferutil
      - utf-8-validate
@@ -16735,20 +16733,6 @@ packages:
        optional: true
      utf-8-validate:
        optional: true
-    dev: true
-
-  /ws@8.16.0:
-    resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: false

  /xdg-basedir@4.0.0:
    resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==}
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -3,6 +3,7 @@ variable "REGISTRY" { default = "" }
 variable "VERSION" { default = "latest" }
 variable "CACHE" { default = "" }
 variable "GCP" { default = false }
+variable "GITHUB_AUTH_KEY" { default = "" }

 group "default" {
  targets = ["app", "app-httpd"]
@@ -28,9 +29,9 @@ target "app" {
    compact(["latest", VERSION])
  ) : []

-  secret = [
-    "type=file,id=composer_auth,src=./composer-auth.json"
-  ]
+  args = {
+    GITHUB_AUTH_KEY = "${GITHUB_AUTH_KEY}"
+  }

  cache-from = notequal("", CACHE) ? ["${CACHE}"] : []
  cache-to   = notequal("", CACHE) ? ["${CACHE},mode=max,ignore-error=true"] : []
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
      - "./docker/database/:/docker-entrypoint-initdb.d/"
      - "./docker/database/mysql:/var/lib/mysql"
    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
      MYSQL_DATABASE: "fleetbase"

  socket:
@@ -34,7 +34,7 @@ services:
      DATABASE_URL: "mysql://root@database/fleetbase"
      QUEUE_CONNECTION: redis
      CACHE_DRIVER: redis
-      CACHE_PATH: /var/www/html/api/storage/framework/cache
+      CACHE_PATH: /fleetbase/api/storage/framework/cache
      CACHE_URL: tcp://cache
      REDIS_URL: tcp://cache

@@ -56,6 +56,7 @@ services:
      target: app-dev
      args:
        ENVIRONMENT: development
+        GITHUB_AUTH_KEY: ${GITHUB_AUTH_KEY}
    environment:
      DATABASE_URL: "mysql://root@database/fleetbase"
      QUEUE_CONNECTION: redis
@@ -76,8 +77,8 @@ services:
  httpd:
    build:
      context: .
-      dockerfile:  docker/httpd/Dockerfile
+      dockerfile: docker/httpd/Dockerfile
    ports:
      - "8000:80"
    depends_on:
-      - application
+      - application
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,31 +4,31 @@ FROM dunglas/frankenphp:sha-7454826-php8.2-alpine as base

 # Install packages
 RUN apk update && apk add git openssh bind-tools mycli nodejs npm \
-    && mkdir -p /root/.ssh \
-    && ssh-keyscan github.com >> /root/.ssh/known_hosts
+  && mkdir -p /root/.ssh \
+  && ssh-keyscan github.com >> /root/.ssh/known_hosts

 # Install PHP Extensions
 RUN install-php-extensions \
-    pdo_mysql \
-    gd \
-    bcmath \
-    redis \
-    intl \
-    zip \
-    gmp \
-    apcu \
-    opcache \
-    memcached \
-    imagick \
-    geos \
-    sockets \
-    pcntl \
-    @composer
+  pdo_mysql \
+  gd \
+  bcmath \
+  redis \
+  intl \
+  zip \
+  gmp \
+  apcu \
+  opcache \
+  memcached \
+  imagick \
+  geos \
+  sockets \
+  pcntl \
+  @composer

 # Update PHP configurations
 RUN sed -e 's/^expose_php.*/expose_php = Off/' "$PHP_INI_DIR/php.ini-production" > "$PHP_INI_DIR/php.ini" \
-    && sed -i -e 's/^upload_max_filesize.*/upload_max_filesize = 600M/' -e 's/^post_max_size.*/post_max_size = 0/' \
-    -e 's/^memory_limit.*/memory_limit = 600M/' "$PHP_INI_DIR/php.ini"
+  && sed -i -e 's/^upload_max_filesize.*/upload_max_filesize = 600M/' -e 's/^post_max_size.*/post_max_size = 0/' \
+  -e 's/^memory_limit.*/memory_limit = 600M/' "$PHP_INI_DIR/php.ini"

 # Install global node modules
 RUN npm install -g chokidar
@@ -48,33 +48,33 @@ ENV OCTANE_SERVER=frankenphp
 ARG ENVIRONMENT=production
 ENV APP_ENV=$ENVIRONMENT

+# Setup github auth
+ARG GITHUB_AUTH_KEY
+
 # Copy Caddyfile
 COPY --chown=www-data:www-data ./Caddyfile $CADDYFILE_PATH

 # Create /fleetbase directory and set correct permissions
 RUN mkdir -p /fleetbase/api && chown -R www-data:www-data /fleetbase

-# Copy packages
-COPY --chown=www-data:www-data ./packages/core-api /fleetbase/packages/core-api
-COPY --chown=www-data:www-data ./packages/fleetops /fleetbase/packages/fleetops
-COPY --chown=www-data:www-data ./packages/storefront /fleetbase/packages/storefront
-
 # Set working directory
 WORKDIR /fleetbase/api

-# Load the secret into the auth.json file if exists, and install dependencies
-COPY composer-auth.jso[n] /fleetbase/api/auth.json
-RUN --mount=type=secret,id=composer_auth,target=/fleetbase/api/auth.json
+# If GITHUB_AUTH_KEY is provided, create auth.json with it
+RUN if [ -n "$GITHUB_AUTH_KEY" ]; then echo "{\"github-oauth\": {\"github.com\": \"$GITHUB_AUTH_KEY\"}}" > auth.json; fi

 # Optimize Composer Dependency Installation
 COPY --chown=www-data:www-data ./api/composer.json ./api/composer.lock /fleetbase/api/

 # Pre-install Composer dependencies
-RUN su www-data -s /bin/sh -c "composer install --no-scripts --no-autoloader --optimize-autoloader --no-dev"
+RUN su www-data -s /bin/sh -c "composer install --no-scripts --optimize-autoloader --no-dev"

 # Setup application
 COPY --chown=www-data:www-data ./api /fleetbase/api

+# Dump autoload
+RUN su www-data -s /bin/sh -c "composer dumpautoload"
+
 # Setup composer root directory
 RUN mkdir -p /root/.composer
 RUN mkdir -p /fleetbase/api/.composer && chown www-data:www-data /fleetbase/api/.composer
@@ -84,6 +84,9 @@ RUN mkdir -p /fleetbase/api/storage/logs/ && touch /fleetbase/api/storage/logs/l
 RUN chown -R www-data:www-data /fleetbase/api/storage
 RUN chmod -R 755 /fleetbase/api/storage

+# Set permissions for deploy script
+RUN chmod +x /fleetbase/api/deploy.sh
+
 # Scheduler base stage
 FROM base as scheduler-base

@@ -115,12 +118,10 @@ CMD ["php", "artisan", "queue:work"]
 # Application dev stage
 FROM base as app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
-# add --watch flag later
+# Add --watch flag later
 CMD ["sh", "-c", "php artisan octane:frankenphp --port=8000 --host=0.0.0.0 --caddyfile $CADDYFILE_PATH"] 
-# CMD ["sh", "-c", "frankenphp run --config $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 --port=8000 --host=0.0.0.0 --https --http-redirect --caddyfile $CADDYFILE_PATH"]
-# CMD ["sh", "-c", "frankenphp run --config $CADDYFILE_PATH"]
--- a/docker/crontab
+++ b/docker/crontab
@@ -1 +1 @@
-* * * * * php /var/www/html/api/artisan schedule:run
+* * * * * php /fleetbase/api/artisan schedule:run
--- a/docker/httpd/Dockerfile
+++ b/docker/httpd/Dockerfile
@@ -4,4 +4,4 @@ FROM nginx:stable-alpine
 ENV NGINX_APPLICATION_HOSTNAME application

 COPY docker/httpd/vhost.conf /etc/nginx/templates/default.conf.template
-COPY api/public/ /var/www/html/api/public/
+COPY api/public/ /fleetbase/api/public/
--- a/docker/httpd/vhost.conf
+++ b/docker/httpd/vhost.conf
@@ -1,7 +1,7 @@
 server {
  listen 80;
  server_name localhost;
-  root /var/www/html/api/public;
+  root /fleetbase/api/public;
  # hide nginx version for security purposes
  server_tokens off;
  access_log  /var/log/nginx/access.log;
@@ -13,33 +13,6 @@ server {
  index index.php;

  location / {
-    try_files $uri $uri/ /index.php?$args;
+    proxy_pass   http://${NGINX_APPLICATION_HOSTNAME}:8000;
  }
-
-  location /uploads {
-    alias /var/www/html/api/storage/app/uploads;
-    autoindex on;
-    try_files $uri $uri/ /index.php?$query_string;
-  }  
-  
-  location /storage {
-    alias /var/www/html/api/storage/app/public;
-    autoindex on;
-    try_files $uri $uri/ /index.php?$query_string;
-  }
-
-  location ~ [^/]\.php(/|$) {
-    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    if (!-f $document_root$fastcgi_script_name) {
-      return 404;
-    }
-
-    include fastcgi_params;
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    fastcgi_param PATH_INFO       $fastcgi_path_info;
-    fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
-
-    proxy_pass   ${NGINX_APPLICATION_HOSTNAME}:8000;
-    fastcgi_index  index.php;
-  }
-}
+}