Skip to content

Commit a74d01a

Browse files
yosifkityosifkit
authored
Merge pull request #869 from infosiftr/freetype-config
Add temporary "freetype-config" workaround for PHP 7.3, 7.2, and 7.1 on buster
2 parents e85ee95 + a0ce8af commit a74d01a

File tree

14 files changed

+48
-0
lines changed

14 files changed

+48
-0
lines changed

‎7.1/buster/apache/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ RUN set -eux; \
254254

255255
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
256256

257+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
258+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
259+
257260
ENTRYPOINT ["docker-php-entrypoint"]
258261
##<autogenerated>##
259262
COPY apache2-foreground /usr/local/bin/

‎7.1/buster/cli/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ RUN set -eux; \
194194

195195
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
196196

197+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
198+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
199+
197200
ENTRYPOINT ["docker-php-entrypoint"]
198201
##<autogenerated>##
199202
CMD ["php", "-a"]

‎7.1/buster/fpm/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ RUN set -eux; \
195195

196196
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
197197

198+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
199+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
200+
198201
ENTRYPOINT ["docker-php-entrypoint"]
199202
##<autogenerated>##
200203
WORKDIR /var/www/html

‎7.1/buster/zts/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ RUN set -eux; \
195195

196196
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
197197

198+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
199+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
200+
198201
ENTRYPOINT ["docker-php-entrypoint"]
199202
##<autogenerated>##
200203
CMD ["php", "-a"]

‎7.2/buster/apache/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
263263
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
264264
RUN docker-php-ext-enable sodium
265265

266+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
267+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
268+
266269
ENTRYPOINT ["docker-php-entrypoint"]
267270
##<autogenerated>##
268271
COPY apache2-foreground /usr/local/bin/

‎7.2/buster/cli/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
203203
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
204204
RUN docker-php-ext-enable sodium
205205

206+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
207+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
208+
206209
ENTRYPOINT ["docker-php-entrypoint"]
207210
##<autogenerated>##
208211
CMD ["php", "-a"]

‎7.2/buster/fpm/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
204204
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
205205
RUN docker-php-ext-enable sodium
206206

207+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
208+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
209+
207210
ENTRYPOINT ["docker-php-entrypoint"]
208211
##<autogenerated>##
209212
WORKDIR /var/www/html

‎7.2/buster/zts/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
204204
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
205205
RUN docker-php-ext-enable sodium
206206

207+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
208+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
209+
207210
ENTRYPOINT ["docker-php-entrypoint"]
208211
##<autogenerated>##
209212
CMD ["php", "-a"]

‎7.3/buster/apache/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
263263
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
264264
RUN docker-php-ext-enable sodium
265265

266+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
267+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
268+
266269
ENTRYPOINT ["docker-php-entrypoint"]
267270
##<autogenerated>##
268271
COPY apache2-foreground /usr/local/bin/

‎7.3/buster/cli/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
203203
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
204204
RUN docker-php-ext-enable sodium
205205

206+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
207+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
208+
206209
ENTRYPOINT ["docker-php-entrypoint"]
207210
##<autogenerated>##
208211
CMD ["php", "-a"]

‎7.3/buster/fpm/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
204204
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
205205
RUN docker-php-ext-enable sodium
206206

207+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
208+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
209+
207210
ENTRYPOINT ["docker-php-entrypoint"]
208211
##<autogenerated>##
209212
WORKDIR /var/www/html

‎7.3/buster/zts/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
204204
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
205205
RUN docker-php-ext-enable sodium
206206

207+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
208+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
209+
207210
ENTRYPOINT ["docker-php-entrypoint"]
208211
##<autogenerated>##
209212
CMD ["php", "-a"]

‎Dockerfile-debian.template

+3
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
213213
# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
214214
RUN docker-php-ext-enable sodium
215215

216+
# temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
217+
RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
218+
216219
ENTRYPOINT ["docker-php-entrypoint"]
217220
##<autogenerated>##
218221
CMD ["php", "-a"]

‎update.sh

+9
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,15 @@ for version in "${versions[@]}"; do
194194
-e '/log_limit/d' \
195195
"$version/$suite/$variant/Dockerfile"
196196
fi
197+
if [ "$suite" = 'stretch' ] || { [ "$majorVersion" = '7' ] && [ "$minorVersion" -ge '4' ]; }; then
198+
# https://github.com/docker-library/php/issues/865
199+
# https://bugs.php.net/bug.php?id=76324
200+
# https://github.com/php/php-src/pull/3632
201+
# https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3
202+
sed -ri \
203+
-e '/freetype-config/d' \
204+
"$version/$suite/$variant/Dockerfile"
205+
fi
197206

198207
# remove any _extra_ blank lines created by the deletions above
199208
gawk '

0 commit comments

Comments
 (0)