Ensure to have phalcon ext on while verifying phalcon tools

2025-12-11 11:31:16 +00:00 · 2021-05-16 19:18:42 +02:00
parent bf81b816c4
commit 36a3016370
26 changed files with 260 additions and 26 deletions
--- a/Dockerfiles/mods/Dockerfile-5.2
+++ b/Dockerfiles/mods/Dockerfile-5.2
@@ -767,8 +767,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-5.3
+++ b/Dockerfiles/mods/Dockerfile-5.3
@@ -910,8 +910,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -931,8 +931,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -960,8 +960,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -977,8 +977,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -1110,8 +1110,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -1124,8 +1124,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -1129,8 +1129,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -1129,8 +1129,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -1107,8 +1107,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -869,8 +869,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -827,8 +827,6 @@ RUN set -eux \
 	&& true


-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 5.2-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-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
 ###
@@ -484,6 +497,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 5.3-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-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
 ###
@@ -553,6 +566,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 5.4-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-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
 ###
@@ -591,6 +604,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 5.5-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-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
 ###
@@ -613,6 +626,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 5.6-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-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
 ###
@@ -626,6 +639,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 7.0-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-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
 ###
@@ -605,6 +618,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 7.1-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-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
 ###
@@ -604,6 +617,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 7.2-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-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
 ###
@@ -626,6 +639,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 7.3-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-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
 ###
@@ -626,6 +639,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 7.4-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-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
 ###
@@ -620,6 +633,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 8.0-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-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
 ###
@@ -513,6 +526,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -22,6 +22,19 @@ LABEL "org.opencontainers.image.title"="PHP-FPM 8.1-work"
 LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-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
 ###
@@ -513,6 +526,13 @@ RUN set -eux \
 	&& (rm -rf /tmp/.* || true)


+# 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
 ###
--- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -432,8 +432,6 @@ RUN set -eux \


 {% endif %}
-
-
 # Deactive PSR and Phalcon:
 # https://github.com/devilbox/docker-php-fpm/issues/201
 RUN set -eux \
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -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
 ###