Skip to content

Commit 7a95a55

Browse files
markmetcalfemarkmetcalfe
committed
Hotfix: Fix php debug image builds
1 parent 935b3af commit 7a95a55

File tree

7 files changed

+1
-65
lines changed

7 files changed

+1
-65
lines changed

‎php/php73-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php73:latest
22

33
RUN pecl install -f xdebug-3.1.6 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php74-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php74:latest
22

33
RUN pecl install -f xdebug-3.1.6 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php80-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php80:latest
22

33
RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php81-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php81:latest
22

33
RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php82-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php82:latest
22

33
RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php83-debug/Dockerfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
FROM totara/docker-dev-php83:latest
22

33
RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
4-
RUN pecl install -f pcov && docker-php-ext-enable pcov.so
54

65
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
76
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
8-
9-
# Set some sensible defaults
10-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
11-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
13-
# Note that PHP's memory limit needs to be high enough.
14-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
15-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

‎php/php84-debug/Dockerfile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
FROM totara/docker-dev-php84:latest
22

3-
RUN pecl channel-update pecl.php.net && \
4-
pecl install -f xdebug-3.4.0 && docker-php-ext-enable xdebug.so && \
5-
pecl install -f pcov && docker-php-ext-enable pcov.so
3+
RUN pecl channel-update pecl.php.net && pecl install -f xdebug-3.4.0 && docker-php-ext-enable xdebug.so
64

75
RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
86
&& echo "xdebug.start_with_request=trigger" >> /usr/local/etc/php/conf.d/xdebug.ini
9-
10-
# Set some sensible defaults
11-
RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
12-
&& echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
13-
# The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
14-
# Note that PHP's memory limit needs to be high enough.
15-
#&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
16-
&& echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini

0 commit comments

Comments
 (0)