silberengel
/
unfold
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug-fix build

imwald
Silberengel 1 week ago
parent
2a32dd4bfd
commit
0be99e87ed
2 changed files with 79 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 130
      composer.lock
  2. 15
      frankenphp/docker-entrypoint.sh

130
composer.lock generated
Unescape View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bd231af493534154dcbc0c3f059f329e", "content-hash": "6801a409dd01157c8d3cde2df133da99",
"packages": [ "packages": [
{ {
"name": "bitwasp/bech32", "name": "bitwasp/bech32",
@ -6655,6 +6655,67 @@
], ],
"time": "2025-02-20T12:04:08+00:00" "time": "2025-02-20T12:04:08+00:00"
}, },
{
"name": "symfony/process",
"version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892",
"reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892",
"shasum": ""
},
"require": {
"php": ">=8.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Process\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v7.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-11-06T14:23:19+00:00"
},
{ {
"name": "symfony/property-access", "name": "symfony/property-access",
"version": "v7.1.11", "version": "v7.1.11",
@ -11116,67 +11177,6 @@
], ],
"time": "2025-06-04T10:09:06+00:00" "time": "2025-06-04T10:09:06+00:00"
}, },
{
"name": "symfony/process",
"version": "v7.1.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892",
"reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892",
"shasum": ""
},
"require": {
"php": ">=8.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Process\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v7.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2024-11-06T14:23:19+00:00"
},
{ {
"name": "symfony/web-profiler-bundle", "name": "symfony/web-profiler-bundle",
"version": "v7.1.11", "version": "v7.1.11",
@ -11311,7 +11311,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": {}, "stability-flags": [],
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
@ -11320,6 +11320,6 @@
"ext-iconv": "*", "ext-iconv": "*",
"ext-openssl": "*" "ext-openssl": "*"
}, },
"platform-dev": {}, "platform-dev": [],
"plugin-api-version": "2.9.0" "plugin-api-version": "2.6.0"
} }

15
frankenphp/docker-entrypoint.sh
Unescape View File

@ -2,6 +2,11 @@
set -e set -e
if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
# Host bind-mount: /app is often owned by another uid; git 2.35+ and Composer (VCS) warn or fail.
if command -v git >/dev/null 2>&1; then
git config --global --add safe.directory /app 2>/dev/null || true
fi
# Install the project the first time PHP is started # Install the project the first time PHP is started
# After the installation, the following block can be deleted # After the installation, the following block can be deleted
if [ ! -f composer.json ]; then if [ ! -f composer.json ]; then
@ -22,8 +27,16 @@ if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
fi fi
fi fi
if [ -z "$(ls -A 'vendor/' 2>/dev/null)" ]; then if [ ! -f vendor/autoload.php ]; then
set +e
composer install --prefer-dist --no-progress --no-interaction composer install --prefer-dist --no-progress --no-interaction
CI_ERR=$?
set -e
if [ "$CI_ERR" -ne 0 ]; then
echo "composer install failed (exit $CI_ERR). If composer.json changed without composer.lock, syncing lock (symfony/process)…"
composer update symfony/process -W --prefer-dist --no-progress --no-interaction --ignore-platform-reqs
composer install --prefer-dist --no-progress --no-interaction
fi
fi fi
# DATABASE_URL from Compose / k8s env, or from a local .env file (dev bind-mount). # DATABASE_URL from Compose / k8s env, or from a local .env file (dev bind-mount).

Write Preview
Loading…
Cancel
Save