Skip to content

Commit ab7ad9f

Browse files
committed
faster debug
1 parent 03de09a commit ab7ad9f

File tree

5 files changed

+5
-124
lines changed

5 files changed

+5
-124
lines changed

data/8.4-alpine/Dockerfile

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,7 @@ RUN apk update \
1313
# install common PHP extensions
1414
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
1515
RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
16-
bcmath \
17-
exif \
18-
gd \
19-
gmp \
20-
igbinary \
21-
imagick \
22-
intl \
23-
mysqli \
24-
php/pecl-database-oci8@e4c20008b0 \
25-
opcache \
26-
pcntl \
27-
pdo_mysql \
28-
php/pecl-database-pdo_oci@6575b4c5fe \
29-
pdo_pgsql \
30-
pdo_sqlsrv \
31-
redis \
32-
sockets \
33-
tidy \
34-
xdebug \
35-
xsl \
36-
zip \
37-
# remove Ghostscript binary, reduce Alpine image size by 23 MB, remove once https://gitlab.alpinelinux.org/alpine/aports/-/issues/13415 is fixed
38-
&& rm /usr/bin/gs \
39-
# pack Oracle Instant Client libs, reduce image size by 85 MB
40-
&& rm /usr/lib/oracle/*/client64/lib/*.jar && tar -czvf /usr/lib/oracle-pack.tar.gz -C / /usr/lib/oracle /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && rm -r /usr/lib/oracle/* /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && mv /usr/lib/oracle-pack.tar.gz /usr/lib/oracle/pack.tar.gz \
41-
&& { echo '#!/bin/sh'; echo 'if [ ! -d /usr/lib/oracle/*/client64 ]; then'; echo ' tar -xzf /usr/lib/oracle/pack.tar.gz -C / && rm /usr/lib/oracle/pack.tar.gz'; echo 'fi'; } > /usr/lib/oracle/setup.sh && chmod +x /usr/lib/oracle/setup.sh
16+
pdo_sqlsrv
4217

4318
# install Composer
4419
RUN install-php-extensions @composer

data/8.4-debian/Dockerfile

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,7 @@ RUN (seq 1 8 | xargs -I{} mkdir -p /usr/share/man/man{}) \
1414
# install common PHP extensions
1515
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
1616
RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
17-
bcmath \
18-
exif \
19-
gd \
20-
gmp \
21-
igbinary \
22-
imagick \
23-
intl \
24-
mysqli \
25-
php/pecl-database-oci8@e4c20008b0 \
26-
opcache \
27-
pcntl \
28-
pdo_mysql \
29-
php/pecl-database-pdo_oci@6575b4c5fe \
30-
pdo_pgsql \
31-
pdo_sqlsrv \
32-
redis \
33-
sockets \
34-
tidy \
35-
xdebug \
36-
xsl \
37-
zip \
38-
# pack Oracle Instant Client libs, reduce image size by 85 MB
39-
&& rm /usr/lib/oracle/*/client64/lib/*.jar && tar -czvf /usr/lib/oracle-pack.tar.gz -C / /usr/lib/oracle /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && rm -r /usr/lib/oracle/* /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && mv /usr/lib/oracle-pack.tar.gz /usr/lib/oracle/pack.tar.gz \
40-
&& { echo '#!/bin/sh'; echo 'if [ ! -d /usr/lib/oracle/*/client64 ]; then'; echo ' tar -xzf /usr/lib/oracle/pack.tar.gz -C / && rm /usr/lib/oracle/pack.tar.gz'; echo 'fi'; } > /usr/lib/oracle/setup.sh && chmod +x /usr/lib/oracle/setup.sh
17+
pdo_sqlsrv
4118

4219
# install Composer
4320
RUN install-php-extensions @composer

data/8.5-alpine/Dockerfile

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,7 @@ RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
2222
&& cd xdebug && git reset --hard edf1bf7482 && rm -r .git \
2323
&& sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
2424
RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
25-
bcmath \
26-
exif \
27-
gd \
28-
gmp \
29-
igbinary/igbinary@2e0788825c \
30-
Imagick/imagick@45adfb7b1e \
31-
intl \
32-
mysqli \
33-
php/pecl-database-oci8@e4c20008b0 \
34-
pcntl \
35-
pdo_mysql \
36-
php/pecl-database-pdo_oci@6575b4c5fe \
37-
pdo_pgsql \
38-
$(realpath pdo_sqlsrv) \
39-
$(realpath phpredis) \
40-
sockets \
41-
tidy \
42-
$(realpath xdebug) \
43-
xsl \
44-
zip \
45-
# remove Ghostscript binary, reduce Alpine image size by 23 MB, remove once https://gitlab.alpinelinux.org/alpine/aports/-/issues/13415 is fixed
46-
&& rm /usr/bin/gs \
47-
# pack Oracle Instant Client libs, reduce image size by 85 MB
48-
&& rm /usr/lib/oracle/*/client64/lib/*.jar && tar -czvf /usr/lib/oracle-pack.tar.gz -C / /usr/lib/oracle /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && rm -r /usr/lib/oracle/* /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && mv /usr/lib/oracle-pack.tar.gz /usr/lib/oracle/pack.tar.gz \
49-
&& { echo '#!/bin/sh'; echo 'if [ ! -d /usr/lib/oracle/*/client64 ]; then'; echo ' tar -xzf /usr/lib/oracle/pack.tar.gz -C / && rm /usr/lib/oracle/pack.tar.gz'; echo 'fi'; } > /usr/lib/oracle/setup.sh && chmod +x /usr/lib/oracle/setup.sh
25+
$(realpath pdo_sqlsrv)
5026

5127
# install Composer
5228
RUN install-php-extensions @composer

data/8.5-debian/Dockerfile

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,7 @@ RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
2323
&& cd xdebug && git reset --hard edf1bf7482 && rm -r .git \
2424
&& sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
2525
RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
26-
bcmath \
27-
exif \
28-
gd \
29-
gmp \
30-
igbinary/igbinary@2e0788825c \
31-
Imagick/imagick@45adfb7b1e \
32-
intl \
33-
mysqli \
34-
php/pecl-database-oci8@e4c20008b0 \
35-
pcntl \
36-
pdo_mysql \
37-
php/pecl-database-pdo_oci@6575b4c5fe \
38-
pdo_pgsql \
39-
$(realpath pdo_sqlsrv) \
40-
$(realpath phpredis) \
41-
sockets \
42-
tidy \
43-
$(realpath xdebug) \
44-
xsl \
45-
zip \
46-
# pack Oracle Instant Client libs, reduce image size by 85 MB
47-
&& rm /usr/lib/oracle/*/client64/lib/*.jar && tar -czvf /usr/lib/oracle-pack.tar.gz -C / /usr/lib/oracle /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && rm -r /usr/lib/oracle/* /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && mv /usr/lib/oracle-pack.tar.gz /usr/lib/oracle/pack.tar.gz \
48-
&& { echo '#!/bin/sh'; echo 'if [ ! -d /usr/lib/oracle/*/client64 ]; then'; echo ' tar -xzf /usr/lib/oracle/pack.tar.gz -C / && rm /usr/lib/oracle/pack.tar.gz'; echo 'fi'; } > /usr/lib/oracle/setup.sh && chmod +x /usr/lib/oracle/setup.sh
26+
$(realpath pdo_sqlsrv)
4927

5028
# install Composer
5129
RUN install-php-extensions @composer

make.php

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -111,33 +111,8 @@
111111
&& sed -E \'s~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~\' -i package.xml && sed -E \'s~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~\' -i config.m4
112112
' : '') . 'RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
113113
' . implode(' \\' . "\n" . ' ', [
114-
'bcmath',
115-
'exif',
116-
'gd',
117-
'gmp',
118-
in_array($phpVersion, ['8.5'], true) ? 'igbinary/igbinary@2e0788825c' : 'igbinary', // TODO waiting for merge https://github.com/igbinary/igbinary/pull/408
119-
in_array($phpVersion, ['8.5'], true) ? 'Imagick/imagick@45adfb7b1e' : 'imagick', // TODO waiting for 3.8.1 release https://github.com/Imagick/imagick/pull/741
120-
'intl',
121-
'mysqli',
122-
in_array($phpVersion, ['7.4', '8.0', '8.1'], true) ? 'oci8' : 'php/pecl-database-oci8@e4c20008b0',
123-
...(in_array($phpVersion, ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'], true) ? ['opcache'] : []), // https://wiki.php.net/rfc/make_opcache_required
124-
'pcntl',
125-
'pdo_mysql',
126-
in_array($phpVersion, ['7.4', '8.0', '8.1', '8.2'], true) ? 'pdo_oci' : 'php/pecl-database-pdo_oci@6575b4c5fe',
127-
'pdo_pgsql',
128114
in_array($phpVersion, ['8.5'], true) ? '$(realpath pdo_sqlsrv)' : 'pdo_sqlsrv',
129-
in_array($phpVersion, ['8.5'], true) ? '$(realpath phpredis)' : 'redis', // TODO waiting for 6.2.1 release https://github.com/phpredis/phpredis/pull/2676
130-
'sockets',
131-
'tidy',
132-
in_array($phpVersion, ['8.5'], true) ? '$(realpath xdebug)' : 'xdebug',
133-
'xsl',
134-
'zip',
135-
]) . ($osName === 'alpine' ? ' \
136-
# remove Ghostscript binary, reduce Alpine image size by 23 MB, remove once https://gitlab.alpinelinux.org/alpine/aports/-/issues/13415 is fixed
137-
&& rm /usr/bin/gs' : '') . ' \
138-
# pack Oracle Instant Client libs, reduce image size by 85 MB
139-
&& rm /usr/lib/oracle/*/client64/lib/*.jar && tar -czvf /usr/lib/oracle-pack.tar.gz -C / /usr/lib/oracle /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && rm -r /usr/lib/oracle/* /usr/local/etc/php/conf.d/docker-php-ext-pdo_oci.ini /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini && mv /usr/lib/oracle-pack.tar.gz /usr/lib/oracle/pack.tar.gz \
140-
&& { echo \'#!/bin/sh\'; echo \'if [ ! -d /usr/lib/oracle/*/client64 ]; then\'; echo \' tar -xzf /usr/lib/oracle/pack.tar.gz -C / && rm /usr/lib/oracle/pack.tar.gz\'; echo \'fi\'; } > /usr/lib/oracle/setup.sh && chmod +x /usr/lib/oracle/setup.sh
115+
]) . '
141116
142117
# install Composer
143118
RUN install-php-extensions @composer

0 commit comments

Comments
 (0)