Skip to content

Commit 7d0034d

Browse files
committed
feat: xdebug-set-mode
1 parent 7f212b0 commit 7d0034d

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/
8383
COPY configs/ports.conf /etc/apache2/ports.conf
8484
COPY configs/logs.conf /etc/apache2/conf-enabled/logs.conf
8585
COPY apache-run.sh /usr/bin/apache-run
86+
COPY ./bin /usr/bin/
8687

87-
RUN chmod a+x /usr/bin/apache-run
88+
RUN chmod a+x /usr/bin/apache-run /usr/bin/xdebug-set-mode
8889

8990
USER www-data
9091

apache-run.sh

100644100755
Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
#!/bin/bash
22

33
if [[ ${XDEBUG_ENABLED} == true ]]; then
4-
sudo rm -f /usr/local/etc/php/conf.d/xdebug.ini || true
5-
echo "zend_extension=xdebug.so" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
6-
echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
7-
echo "xdebug.idekey=${XDEBUG_IDEKEY}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
8-
echo "xdebug.mode=debug" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
9-
echo "xdebug.client_port=${XDEBUG_REMOTE_PORT:-$XDEBUG_CLIENT_PORT}" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
10-
11-
export XDEBUG_AUTOSTART=${XDEBUG_AUTOSTART:-$XDEBUG_START_WITH_REQUEST}
12-
[[ ${XDEBUG_AUTOSTART} == true ]] && {
13-
echo "xdebug.start_with_request=yes" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
14-
} || echo "xdebug.start_with_request=no" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
15-
16-
export XDEBUG_CONNECT_BACK=${XDEBUG_CONNECT_BACK:-$XDEBUG_DISCOVER_CLIENT_HOST}
17-
[[ ${XDEBUG_CONNECT_BACK} == true ]] && {
18-
echo "xdebug.discover_client_host=1" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
19-
} || echo "xdebug.discover_client_host=0" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
4+
sudo xdebug-set-mode ${XDEBUG_MODE:-debug}
205
fi
216

227
if [[ ${NR_ENABLED} == true ]]; then

0 commit comments

Comments
 (0)