From 204958000506e8f5f4d1f2e5f2915a791c940d79 Mon Sep 17 00:00:00 2001 From: alexey Date: Sat, 18 Nov 2023 17:42:43 +0300 Subject: [PATCH] * set default php version to 81 in quick scripts --- bash/xdebug-start.sh | 10 ++++++++++ dockerfiles/php-fpm/xdebug2/xdebug.sh | 4 ++-- dockerfiles/php-fpm/xdebug3/xdebug.sh | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bash/xdebug-start.sh b/bash/xdebug-start.sh index 91b35bf..2710279 100755 --- a/bash/xdebug-start.sh +++ b/bash/xdebug-start.sh @@ -8,9 +8,19 @@ if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=81; fi POSSIBLE_XDEBUG_VERSION=xdebug2 +echo "Choice PHP_VERSION: $PHP_VERSION" + if [[ $PHP_VERSION -ge 81 ]]; then POSSIBLE_XDEBUG_VERSION=xdebug3 fi +echo "Choice POSSIBLE_XDEBUG_VERSION: $POSSIBLE_XDEBUG_VERSION" + +echo + ${DIR}/dockerfiles/php-fpm/${POSSIBLE_XDEBUG_VERSION}/xdebug.sh start ${PHP_VERSION} ${WITH_PROFILER} + +echo ${DIR}/dockerfiles/workspace/xdebug.sh start ${PHP_VERSION} ${WITH_PROFILER} + +echo \ No newline at end of file diff --git a/dockerfiles/php-fpm/xdebug2/xdebug.sh b/dockerfiles/php-fpm/xdebug2/xdebug.sh index 1e1fcc4..32f85a7 100755 --- a/dockerfiles/php-fpm/xdebug2/xdebug.sh +++ b/dockerfiles/php-fpm/xdebug2/xdebug.sh @@ -27,7 +27,7 @@ xdebug_status () xdebug_start () { - echo 'Start xDebug' + echo 'Start xDebug2' # And uncomment line with xdebug extension, thus enabling it ON_CMD="sed -i 's/^;zend_extension=/zend_extension=/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini" @@ -48,7 +48,7 @@ xdebug_start () xdebug_stop () { - echo 'Stop xDebug' + echo 'Stop xDebug2' # Comment out xdebug extension line OFF_CMD="sed -i 's/^zend_extension=/;zend_extension=/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini" diff --git a/dockerfiles/php-fpm/xdebug3/xdebug.sh b/dockerfiles/php-fpm/xdebug3/xdebug.sh index f216fb5..de3d0fc 100755 --- a/dockerfiles/php-fpm/xdebug3/xdebug.sh +++ b/dockerfiles/php-fpm/xdebug3/xdebug.sh @@ -27,7 +27,7 @@ xdebug_status () xdebug_start () { - echo 'Start xDebug' + echo 'Start xDebug3' # And uncomment line with xdebug extension, thus enabling it ON_CMD="sed -i 's/^;zend_extension=/zend_extension=/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini" @@ -42,7 +42,7 @@ xdebug_start () xdebug_stop () { - echo 'Stop xDebug' + echo 'Stop xDebug3' # Comment out xdebug extension line OFF_CMD="sed -i 's/^zend_extension=/;zend_extension=/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"