gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-19 23:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure to have phalcon ext on while verifying phalcon tools

Browse Source
This commit is contained in:
cytopia
2021-05-16 19:18:42 +02:00
parent bf81b816c4
commit 36a3016370
26 changed files with 260 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/ansible/DOCKERFILES/Dockerfile-mods.j2
View File

@@ -432,8 +432,6 @@ RUN set -eux \
{% endif %}
# Deactive PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
RUN set -eux \

20
build/ansible/DOCKERFILES/Dockerfile-work.j2
View File

@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM {{ php_version }}-work"
LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-work"
###
### Re-activate modules which have been deactivated in mods.
### NOTE: They will be removed at the very bottom
###
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
echo "extension=phalcon" > /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini; \
fi \
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
echo "extension=psr" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
fi
###
### Envs
###
@@ -530,6 +543,13 @@ RUN set -eux \
{% endif %}
# Deactive PSR and Phalcon:
# https://github.com/devilbox/docker-php-fpm/issues/201
RUN set -eux \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
###
### Copy files
###