Merge branch 'php8dot0' of github.com:moveis-simonetti/php-apache-oci8-composer into php8dot1

Author: lucassabreu

Dockerfile

@@ -81,8 +81,9 @@ RUN echo "---> Fix permissions" \
 COPY configs/ports.conf /etc/apache2/ports.conf
 COPY configs/logs.conf /etc/apache2/conf-enabled/logs.conf
 COPY apache-run.sh /usr/bin/apache-run
+COPY ./bin /usr/bin/
 
-RUN chmod a+x /usr/bin/apache-run
+RUN chmod a+x /usr/bin/apache-run /usr/bin/xdebug-set-mode
 
 USER www-data
 

apache-run.sh

@@ -1,22 +1,7 @@
 #!/bin/bash
 
 if [[ ${XDEBUG_ENABLED} == true ]]; then
-    sudo rm -f /usr/local/etc/php/conf.d/xdebug.ini || true
-    echo "zend_extension=xdebug.so" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    echo "xdebug.idekey=${XDEBUG_IDEKEY}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    echo "xdebug.mode=debug" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    echo "xdebug.client_port=${XDEBUG_REMOTE_PORT:-$XDEBUG_CLIENT_PORT}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-
-    export XDEBUG_AUTOSTART=${XDEBUG_AUTOSTART:-$XDEBUG_START_WITH_REQUEST}
-    [[ ${XDEBUG_AUTOSTART} == true ]] && {
-        echo "xdebug.start_with_request=yes" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    } || echo "xdebug.start_with_request=no" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-
-    export XDEBUG_CONNECT_BACK=${XDEBUG_CONNECT_BACK:-$XDEBUG_DISCOVER_CLIENT_HOST}
-    [[ ${XDEBUG_CONNECT_BACK} == true ]] && {
-        echo "xdebug.discover_client_host=1" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
-    } || echo "xdebug.discover_client_host=0" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
+    sudo xdebug-set-mode ${XDEBUG_MODE:-debug}
 fi
 
 if [[ ${NR_ENABLED} == true ]]; then