Ensure FFI is enabled by default for PHP 7.4

cytopia · cytopia · commit 3faa0a8245c1 · 2019-01-16T12:25:09.000+01:00
diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
@@ -352,6 +352,9 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -420,6 +420,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
@@ -425,6 +425,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -419,6 +419,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -434,6 +434,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
@@ -463,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
@@ -463,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -464,6 +464,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -439,6 +439,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -127,9 +127,7 @@ RUN set -x \
 # ---- Installing PHP Extension: ffi ----
 	&& git clone https://github.com/dstogov/php-ffi /tmp/ffi \
 	&& cd /tmp/ffi \
-	&& curl -sS -O https://github.com/fpoirotte/php-ffi/commit/734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-&& git apply 734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-&& phpize \
+	&& phpize \
 && ./configure --with-ffi \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
@@ -396,6 +394,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -182,6 +182,11 @@ RUN set -x \
 {%		endif %}
 {%	endif %}
 {% endfor %}
+{# Fix php.ini settings for enabled extensions #}
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
+{# /Fix php.ini settings for enabled extensions #}
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
@@ -912,9 +912,7 @@ extensions_available:
       type: git
       git_url: https://github.com/dstogov/php-ffi
       command: |
-        curl -sS -O https://github.com/fpoirotte/php-ffi/commit/734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-        && git apply 734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-        && phpize \
+        phpize \
         && ./configure --with-ffi \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \

Original file line number	Diff line number	Diff line change
`@@ -352,6 +352,9 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype`
`352`	`352`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`353`	`353`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`354`	`354`	`\`
	`355`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`356`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`357`	`+ fi \`
`355`	`358`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`356`	`359`	`&& rm -rf /tmp/* \`
`357`	`360`	`\`
Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,9 @@ RUN set -x \`
`420`	`420`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`421`	`421`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`422`	`422`	`\`
	`423`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`424`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`425`	`+ fi \`
`423`	`426`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`424`	`427`	`&& rm -rf /tmp/* \`
`425`	`428`	`\`
Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,9 @@ RUN set -x \`
`425`	`425`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`426`	`426`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`427`	`427`	`\`
	`428`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`429`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`430`	`+ fi \`
`428`	`431`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`429`	`432`	`&& rm -rf /tmp/* \`
`430`	`433`	`\`
Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,9 @@ RUN set -x \`
`419`	`419`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`420`	`420`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`421`	`421`	`\`
	`422`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`423`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`424`	`+ fi \`
`422`	`425`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`423`	`426`	`&& rm -rf /tmp/* \`
`424`	`427`	`\`
Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,9 @@ RUN set -x \`
`434`	`434`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`435`	`435`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`436`	`436`	`\`
	`437`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`438`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`439`	`+ fi \`
`437`	`440`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`438`	`441`	`&& rm -rf /tmp/* \`
`439`	`442`	`\`
Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,9 @@ RUN set -x \`
`463`	`463`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`464`	`464`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`465`	`465`	`\`
	`466`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`467`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`468`	`+ fi \`
`466`	`469`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`467`	`470`	`&& rm -rf /tmp/* \`
`468`	`471`	`\`
Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,9 @@ RUN set -x \`
`464`	`464`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`465`	`465`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`466`	`466`	`\`
	`467`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`468`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`469`	`+ fi \`
`467`	`470`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`468`	`471`	`&& rm -rf /tmp/* \`
`469`	`472`	`\`
Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,9 @@ RUN set -x \`
`439`	`439`	`&& (rm -rf /usr/local/lib/php/test/zip \|\| true) \`
`440`	`440`	`&& (rm -rf /usr/local/lib/php/doc/zip \|\| true) \`
`441`	`441`	`\`
	`442`	`+ && if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \`
	`443`	`+ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \`
	`444`	`+ fi \`
`442`	`445`	`&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \`
`443`	`446`	`&& rm -rf /tmp/* \`
`444`	`447`	`\`