Fixed vulnerabilites (trivy was blocking CI)
This commit is contained in:
parent
abad386dc6
commit
b7295eb064
3 changed files with 113 additions and 71 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
|
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
|
||||||
|
|
||||||
ARG PHP_VERSION=8.1.32
|
ARG PHP_VERSION=8.2
|
||||||
ARG CADDY_VERSION=2.10.0
|
ARG CADDY_VERSION=2.10.0
|
||||||
|
|
||||||
# yarn build
|
# yarn build
|
||||||
|
|
|
||||||
173
composer.lock
generated
173
composer.lock
generated
|
|
@ -70,16 +70,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "api-platform/core",
|
"name": "api-platform/core",
|
||||||
"version": "v3.3.12",
|
"version": "v3.4.17",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/api-platform/core.git",
|
"url": "https://github.com/api-platform/core.git",
|
||||||
"reference": "e2eeb6b710f96542b75357a13d8d69ed4d8be5e2"
|
"reference": "c5fb664d17ed9ae919394514ea69a5039d2ad9ab"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/api-platform/core/zipball/e2eeb6b710f96542b75357a13d8d69ed4d8be5e2",
|
"url": "https://api.github.com/repos/api-platform/core/zipball/c5fb664d17ed9ae919394514ea69a5039d2ad9ab",
|
||||||
"reference": "e2eeb6b710f96542b75357a13d8d69ed4d8be5e2",
|
"reference": "c5fb664d17ed9ae919394514ea69a5039d2ad9ab",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -88,13 +88,13 @@
|
||||||
"psr/cache": "^1.0 || ^2.0 || ^3.0",
|
"psr/cache": "^1.0 || ^2.0 || ^3.0",
|
||||||
"psr/container": "^1.0 || ^2.0",
|
"psr/container": "^1.0 || ^2.0",
|
||||||
"symfony/deprecation-contracts": "^3.1",
|
"symfony/deprecation-contracts": "^3.1",
|
||||||
"symfony/http-foundation": "^6.4 || ^7.0",
|
"symfony/http-foundation": "^6.4 || ^7.1",
|
||||||
"symfony/http-kernel": "^6.4 || ^7.0",
|
"symfony/http-kernel": "^6.4 || ^7.1",
|
||||||
"symfony/property-access": "^6.4 || ^7.0",
|
"symfony/property-access": "^6.4 || ^7.1",
|
||||||
"symfony/property-info": "^6.4 || ^7.0",
|
"symfony/property-info": "^6.4 || ^7.1",
|
||||||
"symfony/serializer": "^6.4 || ^7.0",
|
"symfony/serializer": "^6.4 || ^7.1",
|
||||||
"symfony/translation-contracts": "^3.3",
|
"symfony/translation-contracts": "^3.3",
|
||||||
"symfony/web-link": "^6.4 || ^7.0",
|
"symfony/web-link": "^6.4 || ^7.1",
|
||||||
"willdurand/negotiation": "^3.0"
|
"willdurand/negotiation": "^3.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
|
@ -109,12 +109,53 @@
|
||||||
"symfony/framework-bundle": "6.4.6 || 7.0.6",
|
"symfony/framework-bundle": "6.4.6 || 7.0.6",
|
||||||
"symfony/var-exporter": "<6.1.1"
|
"symfony/var-exporter": "<6.1.1"
|
||||||
},
|
},
|
||||||
|
"replace": {
|
||||||
|
"api-platform/doctrine-common": "self.version",
|
||||||
|
"api-platform/doctrine-odm": "self.version",
|
||||||
|
"api-platform/doctrine-orm": "self.version",
|
||||||
|
"api-platform/documentation": "self.version",
|
||||||
|
"api-platform/elasticsearch": "self.version",
|
||||||
|
"api-platform/graphql": "self.version",
|
||||||
|
"api-platform/http-cache": "self.version",
|
||||||
|
"api-platform/hydra": "self.version",
|
||||||
|
"api-platform/json-api": "self.version",
|
||||||
|
"api-platform/json-hal": "self.version",
|
||||||
|
"api-platform/json-schema": "self.version",
|
||||||
|
"api-platform/jsonld": "self.version",
|
||||||
|
"api-platform/laravel": "self.version",
|
||||||
|
"api-platform/metadata": "self.version",
|
||||||
|
"api-platform/openapi": "self.version",
|
||||||
|
"api-platform/parameter-validator": "self.version",
|
||||||
|
"api-platform/ramsey-uuid": "self.version",
|
||||||
|
"api-platform/serializer": "self.version",
|
||||||
|
"api-platform/state": "self.version",
|
||||||
|
"api-platform/symfony": "self.version",
|
||||||
|
"api-platform/validator": "self.version"
|
||||||
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"api-platform/doctrine-common": "^3.4 || ^4.0",
|
||||||
|
"api-platform/doctrine-odm": "^3.4 || ^4.0",
|
||||||
|
"api-platform/doctrine-orm": "^3.4 || ^4.0",
|
||||||
|
"api-platform/documentation": "^3.4 || ^4.0",
|
||||||
|
"api-platform/elasticsearch": "^3.4 || ^4.0",
|
||||||
|
"api-platform/graphql": "^3.4 || ^4.0",
|
||||||
|
"api-platform/http-cache": "^3.4 || ^4.0",
|
||||||
|
"api-platform/hydra": "^3.4 || ^4.0",
|
||||||
|
"api-platform/json-api": "^3.3 || ^4.0",
|
||||||
|
"api-platform/json-schema": "^3.4 || ^4.0",
|
||||||
|
"api-platform/jsonld": "^3.4 || ^4.0",
|
||||||
|
"api-platform/metadata": "^3.4 || ^4.0",
|
||||||
|
"api-platform/openapi": "^3.4 || ^4.0",
|
||||||
|
"api-platform/parameter-validator": "^3.4",
|
||||||
|
"api-platform/ramsey-uuid": "^3.4 || ^4.0",
|
||||||
|
"api-platform/serializer": "^3.4 || ^4.0",
|
||||||
|
"api-platform/state": "^3.4 || ^4.0",
|
||||||
|
"api-platform/validator": "^3.4 || ^4.0",
|
||||||
"behat/behat": "^3.11",
|
"behat/behat": "^3.11",
|
||||||
"behat/mink": "^1.9",
|
"behat/mink": "^1.9",
|
||||||
"doctrine/cache": "^1.11 || ^2.1",
|
"doctrine/cache": "^1.11 || ^2.1",
|
||||||
"doctrine/common": "^3.2.2",
|
"doctrine/common": "^3.2.2",
|
||||||
"doctrine/dbal": "^3.4.0",
|
"doctrine/dbal": "^3.4.0 || ^4.0",
|
||||||
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
|
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
|
||||||
"doctrine/mongodb-odm": "^2.2",
|
"doctrine/mongodb-odm": "^2.2",
|
||||||
"doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
|
"doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
|
||||||
|
|
@ -123,12 +164,12 @@
|
||||||
"friends-of-behat/mink-browserkit-driver": "^1.3.1",
|
"friends-of-behat/mink-browserkit-driver": "^1.3.1",
|
||||||
"friends-of-behat/mink-extension": "^2.2",
|
"friends-of-behat/mink-extension": "^2.2",
|
||||||
"friends-of-behat/symfony-extension": "^2.1",
|
"friends-of-behat/symfony-extension": "^2.1",
|
||||||
"guzzlehttp/guzzle": "^6.0 || ^7.0",
|
"guzzlehttp/guzzle": "^6.0 || ^7.1",
|
||||||
"jangregor/phpstan-prophecy": "^1.0",
|
"jangregor/phpstan-prophecy": "^1.0",
|
||||||
"justinrainbow/json-schema": "^5.2.1",
|
"justinrainbow/json-schema": "^5.2.1",
|
||||||
"phpspec/prophecy-phpunit": "^2.0",
|
"phpspec/prophecy-phpunit": "^2.0",
|
||||||
"phpstan/extension-installer": "^1.1",
|
"phpstan/extension-installer": "^1.1",
|
||||||
"phpstan/phpdoc-parser": "^1.13",
|
"phpstan/phpdoc-parser": "^1.13|^2.0",
|
||||||
"phpstan/phpstan": "^1.10",
|
"phpstan/phpstan": "^1.10",
|
||||||
"phpstan/phpstan-doctrine": "^1.0",
|
"phpstan/phpstan-doctrine": "^1.0",
|
||||||
"phpstan/phpstan-phpunit": "^1.0",
|
"phpstan/phpstan-phpunit": "^1.0",
|
||||||
|
|
@ -136,41 +177,42 @@
|
||||||
"phpunit/phpunit": "^9.6",
|
"phpunit/phpunit": "^9.6",
|
||||||
"psr/log": "^1.0 || ^2.0 || ^3.0",
|
"psr/log": "^1.0 || ^2.0 || ^3.0",
|
||||||
"ramsey/uuid": "^3.9.7 || ^4.0",
|
"ramsey/uuid": "^3.9.7 || ^4.0",
|
||||||
"ramsey/uuid-doctrine": "^1.4 || ^2.0",
|
"ramsey/uuid-doctrine": "^1.4 || ^2.0 || ^3.0",
|
||||||
"sebastian/comparator": "<5.0",
|
"sebastian/comparator": "<5.0",
|
||||||
"soyuka/contexts": "v3.3.9",
|
"soyuka/contexts": "v3.3.9",
|
||||||
"soyuka/pmu": "^0.0.2",
|
"soyuka/pmu": "^0.0.12",
|
||||||
"soyuka/stubs-mongodb": "^1.0",
|
"soyuka/stubs-mongodb": "^1.0",
|
||||||
"symfony/asset": "^6.4 || ^7.0",
|
"symfony/asset": "^6.4 || ^7.1",
|
||||||
"symfony/browser-kit": "^6.4 || ^7.0",
|
"symfony/browser-kit": "^6.4 || ^7.1",
|
||||||
"symfony/cache": "^6.4 || ^7.0",
|
"symfony/cache": "^6.4 || ^7.1",
|
||||||
"symfony/config": "^6.4 || ^7.0",
|
"symfony/config": "^6.4 || ^7.1",
|
||||||
"symfony/console": "^6.4 || ^7.0",
|
"symfony/console": "^6.4 || ^7.1",
|
||||||
"symfony/css-selector": "^6.4 || ^7.0",
|
"symfony/css-selector": "^6.4 || ^7.1",
|
||||||
"symfony/dependency-injection": "^6.4 || ^7.0.12",
|
"symfony/dependency-injection": "^6.4 || ^7.1",
|
||||||
"symfony/doctrine-bridge": "^6.4 || ^7.0",
|
"symfony/doctrine-bridge": "^6.4 || ^7.1",
|
||||||
"symfony/dom-crawler": "^6.4 || ^7.0",
|
"symfony/dom-crawler": "^6.4 || ^7.1",
|
||||||
"symfony/error-handler": "^6.4 || ^7.0",
|
"symfony/error-handler": "^6.4 || ^7.1",
|
||||||
"symfony/event-dispatcher": "^6.4 || ^7.0",
|
"symfony/event-dispatcher": "^6.4 || ^7.1",
|
||||||
"symfony/expression-language": "^6.4 || ^7.0",
|
"symfony/expression-language": "^6.4 || ^7.1",
|
||||||
"symfony/finder": "^6.4 || ^7.0",
|
"symfony/finder": "^6.4 || ^7.1",
|
||||||
"symfony/form": "^6.4 || ^7.0",
|
"symfony/form": "^6.4 || ^7.1",
|
||||||
"symfony/framework-bundle": "^6.4 || ^7.0",
|
"symfony/framework-bundle": "^6.4 || ^7.1",
|
||||||
"symfony/http-client": "^6.4 || ^7.0",
|
"symfony/http-client": "^6.4 || ^7.1",
|
||||||
"symfony/intl": "^6.4 || ^7.0",
|
"symfony/intl": "^6.4 || ^7.1",
|
||||||
"symfony/maker-bundle": "^1.24",
|
"symfony/maker-bundle": "^1.24",
|
||||||
"symfony/mercure-bundle": "*",
|
"symfony/mercure-bundle": "*",
|
||||||
"symfony/messenger": "^6.4 || ^7.0",
|
"symfony/messenger": "^6.4 || ^7.1",
|
||||||
"symfony/phpunit-bridge": "^6.4.1 || ^7.0",
|
"symfony/phpunit-bridge": "^6.4.1 || ^7.1",
|
||||||
"symfony/routing": "^6.4 || ^7.0",
|
"symfony/routing": "^6.4 || ^7.1",
|
||||||
"symfony/security-bundle": "^6.4 || ^7.0",
|
"symfony/security-bundle": "^6.4 || ^7.1",
|
||||||
"symfony/security-core": "^6.4 || ^7.0",
|
"symfony/security-core": "^6.4 || ^7.1",
|
||||||
"symfony/stopwatch": "^6.4 || ^7.0",
|
"symfony/stopwatch": "^6.4 || ^7.1",
|
||||||
"symfony/twig-bundle": "^6.4 || ^7.0",
|
"symfony/string": "^6.4 || ^7.1",
|
||||||
"symfony/uid": "^6.4 || ^7.0",
|
"symfony/twig-bundle": "^6.4 || ^7.1",
|
||||||
"symfony/validator": "^6.4 || ^7.0",
|
"symfony/uid": "^6.4 || ^7.1",
|
||||||
"symfony/web-profiler-bundle": "^6.4 || ^7.0",
|
"symfony/validator": "^6.4 || ^7.1",
|
||||||
"symfony/yaml": "^6.4 || ^7.0",
|
"symfony/web-profiler-bundle": "^6.4 || ^7.1",
|
||||||
|
"symfony/yaml": "^6.4 || ^7.1",
|
||||||
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
|
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
|
||||||
"webonyx/graphql-php": "^14.0 || ^15.0"
|
"webonyx/graphql-php": "^14.0 || ^15.0"
|
||||||
},
|
},
|
||||||
|
|
@ -194,32 +236,23 @@
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"pmu": {
|
||||||
"dev-main": "3.3.x-dev"
|
"projects": [
|
||||||
|
"./src/*/composer.json",
|
||||||
|
"src/Doctrine/*/composer.json"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"thanks": {
|
||||||
|
"url": "https://github.com/api-platform/api-platform",
|
||||||
|
"name": "api-platform/api-platform"
|
||||||
},
|
},
|
||||||
"symfony": {
|
"symfony": {
|
||||||
"require": "^6.4 || ^7.0"
|
"require": "^6.4 || ^7.1"
|
||||||
},
|
},
|
||||||
"projects": [
|
"branch-alias": {
|
||||||
"api-platform/doctrine-common",
|
"dev-3.4": "3.4.x-dev",
|
||||||
"api-platform/doctrine-orm",
|
"dev-main": "4.0.x-dev"
|
||||||
"api-platform/doctrine-odm",
|
}
|
||||||
"api-platform/metadata",
|
|
||||||
"api-platform/json-schema",
|
|
||||||
"api-platform/elasticsearch",
|
|
||||||
"api-platform/jsonld",
|
|
||||||
"api-platform/hydra",
|
|
||||||
"api-platform/openapi",
|
|
||||||
"api-platform/graphql",
|
|
||||||
"api-platform/http-cache",
|
|
||||||
"api-platform/documentation",
|
|
||||||
"api-platform/parameter-validator",
|
|
||||||
"api-platform/ramsey-uuid",
|
|
||||||
"api-platform/serializer",
|
|
||||||
"api-platform/state",
|
|
||||||
"api-platform/symfony",
|
|
||||||
"api-platform/validator"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|
@ -252,9 +285,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/api-platform/core/issues",
|
"issues": "https://github.com/api-platform/core/issues",
|
||||||
"source": "https://github.com/api-platform/core/tree/v3.3.12"
|
"source": "https://github.com/api-platform/core/tree/v3.4.17"
|
||||||
},
|
},
|
||||||
"time": "2024-08-30T14:44:44+00:00"
|
"time": "2025-04-07T08:40:57+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "aws/aws-crt-php",
|
"name": "aws/aws-crt-php",
|
||||||
|
|
@ -19751,7 +19784,7 @@
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
"minimum-stability": "beta",
|
"minimum-stability": "beta",
|
||||||
"stability-flags": [],
|
"stability-flags": {},
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|
@ -19763,6 +19796,6 @@
|
||||||
"ext-xsl": "*",
|
"ext-xsl": "*",
|
||||||
"ext-zip": "*"
|
"ext-zip": "*"
|
||||||
},
|
},
|
||||||
"platform-dev": [],
|
"platform-dev": {},
|
||||||
"plugin-api-version": "2.6.0"
|
"plugin-api-version": "2.6.0"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,15 @@
|
||||||
"ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
|
"ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"doctrine/deprecations": {
|
||||||
|
"version": "1.1",
|
||||||
|
"recipe": {
|
||||||
|
"repo": "github.com/symfony/recipes",
|
||||||
|
"branch": "main",
|
||||||
|
"version": "1.0",
|
||||||
|
"ref": "87424683adc81d7dc305eefec1fced883084aab9"
|
||||||
|
}
|
||||||
|
},
|
||||||
"doctrine/doctrine-bundle": {
|
"doctrine/doctrine-bundle": {
|
||||||
"version": "2.7",
|
"version": "2.7",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue