jandres/Fleetbase-Mirror-Repo
1
0
Fork 0
mirror of https://github.com/fleetbase/fleetbase.git synced 2025-12-19 22:27:22 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Updated FleetOps api/engine for critical patches and improvements

Browse Source
This commit is contained in:
Ronald A. Richardson
2023-06-19 16:29:56 +07:00
parent ddd3d05f09
commit 21bccc1499
7 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/composer.dev.json
View File

@@ -6,9 +6,9 @@
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.0.9-alpha",
"fleetbase/fleetops-api": "^1.0.3-alpha",
"fleetbase/storefront-api": "^1.0.3-alpha",
"fleetbase/core-api": "^1.1.0-alpha",
"fleetbase/fleetops-api": "^1.0.5-alpha",
"fleetbase/storefront-api": "^1.0.4-alpha",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.75",

2
api/composer.json
View File

@@ -7,7 +7,7 @@
"require": {
"php": "^7.3|^8.0",
"fleetbase/core-api": "^1.1.0-alpha",
"fleetbase/fleetops-api": "^1.0.4-alpha",
"fleetbase/fleetops-api": "^1.0.5-alpha",
"fleetbase/storefront-api": "^1.0.4-alpha",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",

87
api/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9b3dd1a262b1786552fd184f64001277",
"content-hash": "cebc71c12d687c61d84f862dcce19abc",
"packages": [
{
"name": "aloha/twilio",
@@ -192,16 +192,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.273.0",
"version": "3.273.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "86078abfba43fce3f71a2714bb10a6b1baec1b78"
"reference": "10631467bdf9869a45197a25b490948af2ef7acd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/86078abfba43fce3f71a2714bb10a6b1baec1b78",
"reference": "86078abfba43fce3f71a2714bb10a6b1baec1b78",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/10631467bdf9869a45197a25b490948af2ef7acd",
"reference": "10631467bdf9869a45197a25b490948af2ef7acd",
"shasum": ""
},
"require": {
@@ -281,9 +281,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.273.0"
"source": "https://github.com/aws/aws-sdk-php/tree/3.273.2"
},
"time": "2023-06-13T18:22:02+00:00"
"time": "2023-06-16T18:53:48+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -1319,28 +1319,28 @@
},
{
"name": "doctrine/inflector",
"version": "2.0.6",
"version": "2.0.8",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
"reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
"reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
"reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^10",
"doctrine/coding-standard": "^11.0",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "^8.5 || ^9.5",
"vimeo/psalm": "^4.25"
"vimeo/psalm": "^4.25 || ^5.4"
},
"type": "library",
"autoload": {
@@ -1390,7 +1390,7 @@
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/2.0.6"
"source": "https://github.com/doctrine/inflector/tree/2.0.8"
},
"funding": [
{
@@ -1406,7 +1406,7 @@
"type": "tidelift"
}
],
"time": "2022-10-20T09:10:12+00:00"
"time": "2023-06-16T13:40:37+00:00"
},
{
"name": "doctrine/lexer",
@@ -1939,16 +1939,16 @@
},
{
"name": "firebase/php-jwt",
"version": "v6.6.0",
"version": "v6.7.0",
"source": {
"type": "git",
"url": "https://github.com/firebase/php-jwt.git",
"reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa"
"reference": "71278f20b0a623389beefe87a641d03948a38870"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/5a9cf79b4a2eb347230384648cc7b0d68cd97faa",
"reference": "5a9cf79b4a2eb347230384648cc7b0d68cd97faa",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/71278f20b0a623389beefe87a641d03948a38870",
"reference": "71278f20b0a623389beefe87a641d03948a38870",
"shasum": ""
},
"require": {
@@ -1996,9 +1996,9 @@
],
"support": {
"issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.6.0"
"source": "https://github.com/firebase/php-jwt/tree/v6.7.0"
},
"time": "2023-06-13T17:11:06+00:00"
"time": "2023-06-14T15:29:26+00:00"
},
{
"name": "fleetbase/core-api",
@@ -2091,16 +2091,16 @@
},
{
"name": "fleetbase/fleetops-api",
"version": "1.0.4-alpha",
"version": "1.0.5-alpha",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops-api.git",
"reference": "04f46a7840e70af2539f056ba0211379735c1e2d"
"reference": "82deaeaa8f185dc4a9760e8de279ad0606c13c2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/04f46a7840e70af2539f056ba0211379735c1e2d",
"reference": "04f46a7840e70af2539f056ba0211379735c1e2d",
"url": "https://api.github.com/repos/fleetbase/fleetops-api/zipball/82deaeaa8f185dc4a9760e8de279ad0606c13c2a",
"reference": "82deaeaa8f185dc4a9760e8de279ad0606c13c2a",
"shasum": ""
},
"require": {
@@ -2161,9 +2161,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops-api/issues",
"source": "https://github.com/fleetbase/fleetops-api/tree/v1.0.4-alpha"
"source": "https://github.com/fleetbase/fleetops-api/tree/v1.0.5-alpha"
},
"time": "2023-06-14T08:19:01+00:00"
"time": "2023-06-19T09:18:30+00:00"
},
{
"name": "fleetbase/storefront-api",
@@ -7155,16 +7155,16 @@
},
{
"name": "phpoffice/phpspreadsheet",
"version": "1.28.0",
"version": "1.29.0",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a"
"reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"shasum": ""
},
"require": {
@@ -7182,7 +7182,7 @@
"ext-zip": "*",
"ext-zlib": "*",
"ezyang/htmlpurifier": "^4.15",
"maennchen/zipstream-php": "^2.1",
"maennchen/zipstream-php": "^2.1 || ^3.0",
"markbaker/complex": "^3.0",
"markbaker/matrix": "^3.0",
"php": "^7.4 || ^8.0",
@@ -7194,12 +7194,12 @@
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
"dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.2.4",
"mitoteam/jpgraph": "^10.3",
"mpdf/mpdf": "^8.1.1",
"phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^8.5 || ^9.0",
"phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
"squizlabs/php_codesniffer": "^3.7",
"tecnickcom/tcpdf": "^6.5"
},
@@ -7254,9 +7254,9 @@
],
"support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.28.0"
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0"
},
"time": "2023-02-25T12:24:49+00:00"
"time": "2023-06-14T22:48:31+00:00"
},
{
"name": "phpoption/phpoption",
@@ -7791,16 +7791,16 @@
},
{
"name": "predis/predis",
"version": "v2.1.2",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/predis/predis.git",
"reference": "a77a43913a74f9331f637bb12867eb8e274814e5"
"reference": "33b70b971a32b0d28b4f748b0547593dce316e0d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/predis/predis/zipball/a77a43913a74f9331f637bb12867eb8e274814e5",
"reference": "a77a43913a74f9331f637bb12867eb8e274814e5",
"url": "https://api.github.com/repos/predis/predis/zipball/33b70b971a32b0d28b4f748b0547593dce316e0d",
"reference": "33b70b971a32b0d28b4f748b0547593dce316e0d",
"shasum": ""
},
"require": {
@@ -7811,6 +7811,9 @@
"phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^8.0 || ~9.4.4"
},
"suggest": {
"ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
},
"type": "library",
"autoload": {
"psr-4": {
@@ -7837,7 +7840,7 @@
],
"support": {
"issues": "https://github.com/predis/predis/issues",
"source": "https://github.com/predis/predis/tree/v2.1.2"
"source": "https://github.com/predis/predis/tree/v2.2.0"
},
"funding": [
{
@@ -7845,7 +7848,7 @@
"type": "github"
}
],
"time": "2023-03-02T18:32:04+00:00"
"time": "2023-06-14T10:37:31+00:00"
},
{
"name": "psr/cache",

2
console

Submodule console updated: 1af06bc5d3...674900c8a5

3
docker/Dockerfile
View File

@@ -61,6 +61,9 @@ COPY startup.sh /startup.sh
# Make sure the script is executable
RUN chmod +x /startup.sh
# Create unique instance ID
RUN echo $(cat /proc/sys/kernel/random/uuid) > /.fleetbase
# Set environment
ARG ENVIRONMENT=production
ENV APP_ENV=$ENVIRONMENT

2
packages/fleetops-api

Submodule packages/fleetops-api updated: 04f46a7840...82deaeaa8f

2
packages/fleetops-engine

Submodule packages/fleetops-engine updated: 63822071d5...f30a51ca63