From 11f0957963160b5af233881141837ae99d8cfed1 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 30 Mar 2025 21:03:40 +0800 Subject: [PATCH] Add SPC_DOCKER_DEBUG for gnu docker, remove classmap for alpine docker --- bin/spc-alpine-docker | 2 +- bin/spc-gnu-docker | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/spc-alpine-docker b/bin/spc-alpine-docker index 28cc4939..e2e28dcd 100755 --- a/bin/spc-alpine-docker +++ b/bin/spc-alpine-docker @@ -95,7 +95,7 @@ WORKDIR /app ADD ./src /app/src COPY ./composer.* /app/ ADD ./bin /app/bin -RUN composer install --no-dev --classmap-authoritative +RUN composer install --no-dev EOF fi diff --git a/bin/spc-gnu-docker b/bin/spc-gnu-docker index fa84e58c..101994e4 100755 --- a/bin/spc-gnu-docker +++ b/bin/spc-gnu-docker @@ -145,4 +145,8 @@ echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' # shellcheck disable=SC2086 # shellcheck disable=SC2090 -$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH bin/spc $@ +if [ "$SPC_DOCKER_DEBUG" = "yes" ]; then + $DOCKER_EXECUTABLE run --rm -it --privileged $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH +else + $DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH bin/spc $@ +fi