crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-04 23:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix docker doctor fix pkgroot volume overwrite bug

Browse Source
This commit is contained in:
crazywhalecc
2025-09-04 12:03:13 +08:00
parent 38ec03fe30
commit a79564f685
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/SPC/doctor/item/PkgConfigCheck.php
View File

@@ -29,6 +29,18 @@ class PkgConfigCheck
return CheckResult::ok($pkgconf);
}
#[AsCheckItem('if pkg-config is working', level: 799)]
public function checkPkgConfigFunctional(): CheckResult
{
$pkgconf = PkgConfigUtil::findPkgConfig();
// check if pkg-config is functional
[$ret, $output] = shell()->execWithResult("{$pkgconf} --version", false);
if ($ret === 0) {
return CheckResult::ok(implode(' ', $output));
}
return CheckResult::fail('pkg-config is not functional', 'install-pkgconfig');
}
#[AsFixItem('install-pkgconfig')]
public function installPkgConfig(): bool
{

4
src/SPC/util/GlobalEnvManager.php
View File

@@ -40,6 +40,10 @@ class GlobalEnvManager
if (is_unix()) {
self::addPathIfNotExists(BUILD_BIN_PATH);
self::addPathIfNotExists(PKG_ROOT_PATH . '/bin');
// internally use `WORKING_DIR/pkgroot-private` to avoid volume mount issues in Docker
if (is_dir(WORKING_DIR . '/pkgroot-private/bin')) {
self::addPathIfNotExists(WORKING_DIR . '/pkgroot-private/bin');
}
self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
}

1
src/SPC/util/PkgConfigUtil.php
View File

@@ -23,6 +23,7 @@ class PkgConfigUtil
{
// Find pkg-config executable
$find_list = [
WORKING_DIR . '/pkgroot-private/bin/pkg-config', // used in Docker build, which is installed inside the container to avoid volume mounting issues
PKG_ROOT_PATH . '/bin/pkg-config',
BUILD_BIN_PATH . '/pkg-config',
];