crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-19 05:14:52 +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
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
5 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/spc-alpine-docker
View File

@ -3,7 +3,7 @@
set -e set -e
# This file is using docker to run commands # This file is using docker to run commands
SPC_DOCKER_VERSION=v5 SPC_DOCKER_VERSION=v6
# Detect docker can run # Detect docker can run
if ! which docker >/dev/null; then if ! which docker >/dev/null; then
@ -122,6 +122,9 @@ ADD ./src /app/src
COPY ./composer.* /app/ COPY ./composer.* /app/
ADD ./bin /app/bin ADD ./bin /app/bin
RUN composer install --no-dev RUN composer install --no-dev
ADD ./config /app/config
RUN PKG_ROOT_PATH=/app/pkgroot-private bin/spc doctor --auto-fix
RUN PKG_ROOT_PATH=/app/pkgroot-private bin/spc install-pkg upx
EOF EOF
fi fi

5
bin/spc-gnu-docker
View File

@ -3,7 +3,7 @@
set -e set -e
# This file is using docker to run commands # This file is using docker to run commands
SPC_DOCKER_VERSION=v5 SPC_DOCKER_VERSION=v6
# Detect docker can run # Detect docker can run
if ! which docker >/dev/null; then if ! which docker >/dev/null; then
@ -112,7 +112,8 @@ ENV SPC_LIBC=glibc
ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH" ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH"
ADD ./config /app/config ADD ./config /app/config
RUN CC=gcc bin/spc doctor --auto-fix --debug RUN CC=gcc PKG_ROOT_PATH=/app/pkgroot-private bin/spc doctor --auto-fix --debug
RUN PKG_ROOT_PATH=/app/pkgroot-private bin/spc install-pkg upx
RUN if [ -f /app/buildroot/bin/re2c ]; then \ RUN if [ -f /app/buildroot/bin/re2c ]; then \
cp /app/buildroot/bin/re2c /usr/local/bin/re2c ;\ cp /app/buildroot/bin/re2c /usr/local/bin/re2c ;\
fi fi

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

@ -29,6 +29,18 @@ class PkgConfigCheck
return CheckResult::ok($pkgconf); 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')] #[AsFixItem('install-pkgconfig')]
public function installPkgConfig(): bool public function installPkgConfig(): bool
{ {

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

@ -40,6 +40,10 @@ class GlobalEnvManager
if (is_unix()) { if (is_unix()) {
self::addPathIfNotExists(BUILD_BIN_PATH); self::addPathIfNotExists(BUILD_BIN_PATH);
self::addPathIfNotExists(PKG_ROOT_PATH . '/bin'); 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'); 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 pkg-config executable
$find_list = [ $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', PKG_ROOT_PATH . '/bin/pkg-config',
BUILD_BIN_PATH . '/pkg-config', BUILD_BIN_PATH . '/pkg-config',
]; ];