Skip to content

Commit 1eaf48a

Browse files
author
Vladislav Aksjonov
authored
Merge pull request #20 from Internetrix/php8.1
xDebug enabled for all versions, more compose params
2 parents dce7364 + b799ce1 commit 1eaf48a

File tree

4 files changed

+59
-23
lines changed

4 files changed

+59
-23
lines changed

‎lap-wildcard/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive
77
RUN apt-get -y update
88
RUN apt-get -y install php-xdebug
99

10-
# Add custom PHP 5.6 | 7.0 | 7.1 | 7.2 | 7.3 | 7.4 config
10+
# Add custom PHP 5.6 | 7.0 | 7.1 | 7.2 | 7.3 | 7.4 | 8.0 | 8.1 config
1111
ADD config/php/webdev_common_php_config.ini /etc/php/webdev_common_php_config.ini
1212
RUN cat /etc/php/webdev_common_php_config.ini | tee -a /etc/php/5.6/fpm/php.ini /etc/php/7.0/fpm/php.ini /etc/php/7.1/fpm/php.ini /etc/php/7.2/fpm/php.ini /etc/php/7.3/fpm/php.ini /etc/php/7.4/fpm/php.ini /etc/php/8.0/fpm/php.ini /etc/php/8.1/fpm/php.ini
1313

@@ -90,6 +90,14 @@ ENV WEBDEV_ENABLE_PHP_73_FPM 1
9090
ENV WEBDEV_ENABLE_PHP_74_FPM 1
9191
ENV WEBDEV_ENABLE_PHP_80_FPM 1
9292
ENV WEBDEV_ENABLE_PHP_81_FPM 1
93+
ENV XDEBUG_PHP_56_MODE 'develop'
94+
ENV XDEBUG_PHP_70_MODE 'develop'
95+
ENV XDEBUG_PHP_71_MODE 'develop'
96+
ENV XDEBUG_PHP_72_MODE 'develop'
97+
ENV XDEBUG_PHP_73_MODE 'develop'
98+
ENV XDEBUG_PHP_74_MODE 'develop'
99+
ENV XDEBUG_PHP_80_MODE 'develop'
100+
ENV XDEBUG_PHP_81_MODE 'develop'
93101
ENV WEBDEV_REMOTE_HOST_IP 192.168.99.1
94102
ENV WEBDEV_CIFS_HOST_FOLDER //192.168.99.1/www
95103
ENV WEBDEV_CIFS_SMB_VERSION 3.0

‎lap-wildcard/apache-foreground.sh‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ echo "##END-webdev-config" >> /opt/phpmyadmin_legacy/config.inc.php
6868

6969
#Setup composer github token, if provided
7070
if [ "$COMPOSER_GITHUB_TOKEN" != "" ]; then
71-
echo "{\"github-oauth\": {\"github.com\": \"$COMPOSER_GITHUB_TOKEN\"}}" >> /root/.config/composer/auth.json
71+
echo "{\"github-oauth\": {\"github.com\": \"$COMPOSER_GITHUB_TOKEN\"}}" > /root/.config/composer/auth.json
7272
echo "Composer Auth file created"
7373
else
7474
echo "No GitHub token provided"
@@ -131,16 +131,44 @@ fi
131131

132132
# Update PHP xdebug.remote_host IP
133133
if [ "$WEBDEV_REMOTE_HOST_IP" != "" ]; then
134-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/5.6/fpm/php.ini
135-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.0/fpm/php.ini
136-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.1/fpm/php.ini
137-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.2/fpm/php.ini
138-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.3/fpm/php.ini
139-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.4/fpm/php.ini
140-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/8.0/fpm/php.ini
141-
sed -i -e "s~xdebug.remote_host=[0-9.a-zA-Z]*~xdebug.remote_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/8.1/fpm/php.ini
134+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/5.6/fpm/php.ini
135+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.0/fpm/php.ini
136+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.1/fpm/php.ini
137+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.2/fpm/php.ini
138+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.3/fpm/php.ini
139+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/7.4/fpm/php.ini
140+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/8.0/fpm/php.ini
141+
sed -i -e "s~xdebug.client_host=[0-9.a-zA-Z]*~xdebug.client_host=$WEBDEV_REMOTE_HOST_IP~g" /etc/php/8.1/fpm/php.ini
142142
fi
143143

144+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_56_MODE~g" /etc/php/5.6/fpm/php.ini
145+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_70_MODE~g" /etc/php/7.0/fpm/php.ini
146+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_71_MODE~g" /etc/php/7.1/fpm/php.ini
147+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_72_MODE~g" /etc/php/7.2/fpm/php.ini
148+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_73_MODE~g" /etc/php/7.3/fpm/php.ini
149+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_74_MODE~g" /etc/php/7.4/fpm/php.ini
150+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_80_MODE~g" /etc/php/8.0/fpm/php.ini
151+
sed -i -e "s~xdebug.mode=[0-9.,a-zA-Z]*~xdebug.mode=$XDEBUG_PHP_81_MODE~g" /etc/php/8.1/fpm/php.ini
152+
153+
mkdir /tmp/xdebug
154+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php56~g" /etc/php/5.6/fpm/php.ini
155+
mkdir /tmp/xdebug/php56
156+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php70~g" /etc/php/7.0/fpm/php.ini
157+
mkdir /tmp/xdebug/php70
158+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php71~g" /etc/php/7.1/fpm/php.ini
159+
mkdir /tmp/xdebug/php71
160+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php72~g" /etc/php/7.2/fpm/php.ini
161+
mkdir /tmp/xdebug/php72
162+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php73~g" /etc/php/7.3/fpm/php.ini
163+
mkdir /tmp/xdebug/php73
164+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php74~g" /etc/php/7.4/fpm/php.ini
165+
mkdir /tmp/xdebug/php74
166+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php80~g" /etc/php/8.0/fpm/php.ini
167+
mkdir /tmp/xdebug/php80
168+
sed -i -e "s~xdebug.output_dir=[0-9./a-zA-Z]*~xdebug.output_dir=/tmp/xdebug/php81~g" /etc/php/8.1/fpm/php.ini
169+
mkdir /tmp/xdebug/php81
170+
chmod -R 0777 /tmp/xdebug/
171+
144172
# Only start PHP 5.6 FPM if WEBDEV_ENABLE_PHP_70_FPM is 1
145173
if [ "$WEBDEV_ENABLE_PHP_56_FPM" = 1 ]; then
146174
echo "==============Starting PHP 5.6 FPM..."

‎lap-wildcard/config/php/webdev_common_php_config.ini‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ max_execution_time=90
66
display_errors=On
77
zlib.output_compression=On
88
[xdebug]
9-
xdebug.remote_enable=on
9+
xdebug.mode=develop,debug
10+
xdebug.start_with_request=yes
1011
xdebug.remote_handler=dbgp
11-
xdebug.remote_host=192.168.99.1
12-
xdebug.remote_port=9000
13-
xdebug.profiler_enable_trigger=1
14-
xdebug.profiler_output_dir='/var/www/php/xdebug.profiler'
12+
xdebug.client_host=192.168.99.1
13+
xdebug.client_port=9000
14+
xdebug.output_dir=/tmp/xdebug
1515
##END-webdev-config

‎lap/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,49 @@ RUN apt-get -qq update
3030
RUN apt-get -qqy upgrade
3131

3232
# PHP 8.1
33-
RUN apt-get -qqy install php8.1 php8.1-cli php8.1-fpm php8.1-mysql php8.1-curl php8.1-soap php8.1-common php8.1-gd php8.1-tidy php8.1-mbstring php8.1-xml php8.1-intl php8.1-memcache php8.1-yaml php8.1-zip
33+
RUN apt-get -qqy install php8.1 php8.1-cli php8.1-xdebug php8.1-fpm php8.1-mysql php8.1-curl php8.1-soap php8.1-common php8.1-gd php8.1-tidy php8.1-mbstring php8.1-xml php8.1-intl php8.1-memcache php8.1-yaml php8.1-zip
3434

3535
RUN echo "date.timezone = Australia/Sydney" > /etc/php/8.1/cli/conf.d/timezone.ini && \
3636
echo "date.timezone = Australia/Sydney" > /etc/php/8.1/fpm/conf.d/timezone.ini
3737

3838
# PHP 8.0
39-
RUN apt-get -qqy install php8.0 php8.0-cli php8.0-fpm php8.0-mysql php8.0-curl php8.0-soap php8.0-common php8.0-gd php8.0-tidy php8.0-mbstring php8.0-xml php8.0-intl php8.0-memcache php8.0-yaml php8.0-zip
39+
RUN apt-get -qqy install php8.0 php8.0-cli php8.0-xdebug php8.0-fpm php8.0-mysql php8.0-curl php8.0-soap php8.0-common php8.0-gd php8.0-tidy php8.0-mbstring php8.0-xml php8.0-intl php8.0-memcache php8.0-yaml php8.0-zip
4040

4141
RUN echo "date.timezone = Australia/Sydney" > /etc/php/8.0/cli/conf.d/timezone.ini && \
4242
echo "date.timezone = Australia/Sydney" > /etc/php/8.0/fpm/conf.d/timezone.ini
4343

4444
# PHP 7.4
45-
RUN apt-get -qqy install php7.4 php7.4-cli php7.4-fpm php7.4-mysql php7.4-curl php7.4-soap php7.4-common php7.4-gd php7.4-tidy php7.4-mbstring php7.4-xml php7.4-intl php7.4-memcache php7.4-yaml php7.4-zip
45+
RUN apt-get -qqy install php7.4 php7.4-cli php7.4-xdebug php7.4-fpm php7.4-mysql php7.4-curl php7.4-soap php7.4-common php7.4-gd php7.4-tidy php7.4-mbstring php7.4-xml php7.4-intl php7.4-memcache php7.4-yaml php7.4-zip
4646

4747
RUN echo "date.timezone = Australia/Sydney" > /etc/php/7.4/cli/conf.d/timezone.ini && \
4848
echo "date.timezone = Australia/Sydney" > /etc/php/7.4/fpm/conf.d/timezone.ini
4949

5050
# PHP 7.3
51-
RUN apt-get -qqy install php7.3 php7.3-cli php7.3-fpm php7.3-mysql php7.3-curl php7.3-soap php7.3-common php7.3-gd php7.3-tidy php7.3-mbstring php7.3-xml php7.3-intl php7.3-memcache php7.3-yaml php7.3-zip
51+
RUN apt-get -qqy install php7.3 php7.3-cli php7.3-xdebug php7.3-fpm php7.3-mysql php7.3-curl php7.3-soap php7.3-common php7.3-gd php7.3-tidy php7.3-mbstring php7.3-xml php7.3-intl php7.3-memcache php7.3-yaml php7.3-zip
5252

5353
RUN echo "date.timezone = Australia/Sydney" > /etc/php/7.3/cli/conf.d/timezone.ini && \
5454
echo "date.timezone = Australia/Sydney" > /etc/php/7.3/fpm/conf.d/timezone.ini
5555

5656
# PHP 7.2
57-
RUN apt-get -qqy install php7.2 php7.2-cli php7.2-fpm php7.2-mysql php7.2-curl php7.2-soap php7.2-common php7.2-gd php7.2-tidy php7.2-mbstring php7.2-xml php7.2-intl php7.2-memcache php7.2-yaml php7.2-zip
57+
RUN apt-get -qqy install php7.2 php7.2-cli php7.2-xdebug php7.2-fpm php7.2-mysql php7.2-curl php7.2-soap php7.2-common php7.2-gd php7.2-tidy php7.2-mbstring php7.2-xml php7.2-intl php7.2-memcache php7.2-yaml php7.2-zip
5858

5959
RUN echo "date.timezone = Australia/Sydney" > /etc/php/7.2/cli/conf.d/timezone.ini && \
6060
echo "date.timezone = Australia/Sydney" > /etc/php/7.2/fpm/conf.d/timezone.ini
6161

6262
# PHP 7.1
63-
RUN apt-get -qqy install php7.1 php7.1-cli php7.1-fpm php7.1-mysql php7.1-curl php7.1-soap php7.1-common php7.1-gd php7.1-mcrypt php7.1-tidy php7.1-mbstring php7.1-xml php7.1-intl php7.1-memcache php7.1-yaml php7.1-zip
63+
RUN apt-get -qqy install php7.1 php7.1-cli php7.1-xdebug php7.1-fpm php7.1-mysql php7.1-curl php7.1-soap php7.1-common php7.1-gd php7.1-mcrypt php7.1-tidy php7.1-mbstring php7.1-xml php7.1-intl php7.1-memcache php7.1-yaml php7.1-zip
6464

6565
RUN echo "date.timezone = Australia/Sydney" > /etc/php/7.1/cli/conf.d/timezone.ini && \
6666
echo "date.timezone = Australia/Sydney" > /etc/php/7.1/fpm/conf.d/timezone.ini
6767

6868
# PHP 7.0
69-
RUN apt-get -qqy install php7.0 php7.0-cli php7.0-fpm php7.0-mysql php7.0-curl php7.0-soap php7.0-common php7.0-gd php7.0-mcrypt php7.0-tidy php7.0-mbstring php7.0-xml php7.0-intl php7.0-memcache php7.0-yaml php7.0-zip
69+
RUN apt-get -qqy install php7.0 php7.0-cli php7.0-xdebug php7.0-fpm php7.0-mysql php7.0-curl php7.0-soap php7.0-common php7.0-gd php7.0-mcrypt php7.0-tidy php7.0-mbstring php7.0-xml php7.0-intl php7.0-memcache php7.0-yaml php7.0-zip
7070

7171
RUN echo "date.timezone = Australia/Sydney" > /etc/php/7.0/cli/conf.d/timezone.ini && \
7272
echo "date.timezone = Australia/Sydney" > /etc/php/7.0/fpm/conf.d/timezone.ini
7373

7474
# PHP 5.6
75-
RUN apt-get -qqy install php5.6 php5.6-cli php5.6-fpm php5.6-mysql php5.6-common php5.6-curl php5.6-soap php5.6-gd php5.6-mcrypt php5.6-tidy php5.6-mbstring php5.6-xml php5.6-intl php5.6-memcache php5.6-yaml php5.6-zip
75+
RUN apt-get -qqy install php5.6 php5.6-cli php5.6-xdebug php5.6-fpm php5.6-mysql php5.6-common php5.6-curl php5.6-soap php5.6-gd php5.6-mcrypt php5.6-tidy php5.6-mbstring php5.6-xml php5.6-intl php5.6-memcache php5.6-yaml php5.6-zip
7676

7777
RUN echo "date.timezone = Australia/Sydney" > /etc/php/5.6/cli/conf.d/timezone.ini && \
7878
echo "date.timezone = Australia/Sydney" > /etc/php/5.6/fpm/conf.d/timezone.ini

0 commit comments

Comments
 (0)