Skip to content

Commit 4778097

Browse files
yosifkityosifkit
authored
Merge pull request #440 from infosiftr/gd-freetype
Build freetype support in gd extension
2 parents 9ec4bcc + f4cc67f commit 4778097

File tree

15 files changed

+94
-19
lines changed

15 files changed

+94
-19
lines changed

‎Dockerfile-alpine.template‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@ RUN set -ex; \
1414
\
1515
apk add --no-cache --virtual .build-deps \
1616
$PHPIZE_DEPS \
17+
freetype-dev \
1718
imagemagick-dev \
1819
libjpeg-turbo-dev \
1920
libpng-dev \
2021
libzip-dev \
2122
; \
2223
\
23-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
24+
docker-php-ext-configure gd \
25+
--with-freetype-dir=/usr \
26+
--with-jpeg-dir=/usr \
27+
--with-png-dir=/usr \
28+
; \
2429
docker-php-ext-install -j "$(nproc)" \
2530
bcmath \
2631
exif \

‎Dockerfile-cli.template‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ RUN set -ex; \
55
\
66
apk add --no-cache --virtual .build-deps \
77
$PHPIZE_DEPS \
8+
freetype-dev \
89
imagemagick-dev \
910
libjpeg-turbo-dev \
1011
libpng-dev \
1112
libzip-dev \
1213
; \
1314
\
14-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
15-
docker-php-ext-install \
15+
docker-php-ext-configure gd \
16+
--with-freetype-dir=/usr \
17+
--with-jpeg-dir=/usr \
18+
--with-png-dir=/usr \
19+
; \
20+
docker-php-ext-install -j "$(nproc)" \
1621
bcmath \
1722
exif \
1823
gd \

‎Dockerfile-debian.template‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19+
libfreetype6-dev \
1920
libjpeg-dev \
2021
libmagickwand-dev \
2122
libpng-dev \
2223
libzip-dev \
2324
; \
2425
\
25-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
26+
docker-php-ext-configure gd \
27+
--with-freetype-dir=/usr \
28+
--with-jpeg-dir=/usr \
29+
--with-png-dir=/usr \
30+
; \
2631
docker-php-ext-install -j "$(nproc)" \
2732
bcmath \
2833
exif \

‎php7.1/apache/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19+
libfreetype6-dev \
1920
libjpeg-dev \
2021
libmagickwand-dev \
2122
libpng-dev \
2223
; \
2324
\
24-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
25+
docker-php-ext-configure gd \
26+
--with-freetype-dir=/usr \
27+
--with-jpeg-dir=/usr \
28+
--with-png-dir=/usr \
29+
; \
2530
docker-php-ext-install -j "$(nproc)" \
2631
bcmath \
2732
exif \

‎php7.1/cli/Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ RUN set -ex; \
55
\
66
apk add --no-cache --virtual .build-deps \
77
$PHPIZE_DEPS \
8+
freetype-dev \
89
imagemagick-dev \
910
libjpeg-turbo-dev \
1011
libpng-dev \
1112
; \
1213
\
13-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
14-
docker-php-ext-install \
14+
docker-php-ext-configure gd \
15+
--with-freetype-dir=/usr \
16+
--with-jpeg-dir=/usr \
17+
--with-png-dir=/usr \
18+
; \
19+
docker-php-ext-install -j "$(nproc)" \
1520
bcmath \
1621
exif \
1722
gd \

‎php7.1/fpm-alpine/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ RUN set -ex; \
1414
\
1515
apk add --no-cache --virtual .build-deps \
1616
$PHPIZE_DEPS \
17+
freetype-dev \
1718
imagemagick-dev \
1819
libjpeg-turbo-dev \
1920
libpng-dev \
2021
; \
2122
\
22-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
23+
docker-php-ext-configure gd \
24+
--with-freetype-dir=/usr \
25+
--with-jpeg-dir=/usr \
26+
--with-png-dir=/usr \
27+
; \
2328
docker-php-ext-install -j "$(nproc)" \
2429
bcmath \
2530
exif \

‎php7.1/fpm/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19+
libfreetype6-dev \
1920
libjpeg-dev \
2021
libmagickwand-dev \
2122
libpng-dev \
2223
; \
2324
\
24-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
25+
docker-php-ext-configure gd \
26+
--with-freetype-dir=/usr \
27+
--with-jpeg-dir=/usr \
28+
--with-png-dir=/usr \
29+
; \
2530
docker-php-ext-install -j "$(nproc)" \
2631
bcmath \
2732
exif \

‎php7.2/apache/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ RUN set -ex; \
1616
\
1717
apt-get update; \
1818
apt-get install -y --no-install-recommends \
19+
libfreetype6-dev \
1920
libjpeg-dev \
2021
libmagickwand-dev \
2122
libpng-dev \
2223
; \
2324
\
24-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
25+
docker-php-ext-configure gd \
26+
--with-freetype-dir=/usr \
27+
--with-jpeg-dir=/usr \
28+
--with-png-dir=/usr \
29+
; \
2530
docker-php-ext-install -j "$(nproc)" \
2631
bcmath \
2732
exif \

‎php7.2/cli/Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ RUN set -ex; \
55
\
66
apk add --no-cache --virtual .build-deps \
77
$PHPIZE_DEPS \
8+
freetype-dev \
89
imagemagick-dev \
910
libjpeg-turbo-dev \
1011
libpng-dev \
1112
; \
1213
\
13-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
14-
docker-php-ext-install \
14+
docker-php-ext-configure gd \
15+
--with-freetype-dir=/usr \
16+
--with-jpeg-dir=/usr \
17+
--with-png-dir=/usr \
18+
; \
19+
docker-php-ext-install -j "$(nproc)" \
1520
bcmath \
1621
exif \
1722
gd \

‎php7.2/fpm-alpine/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ RUN set -ex; \
1414
\
1515
apk add --no-cache --virtual .build-deps \
1616
$PHPIZE_DEPS \
17+
freetype-dev \
1718
imagemagick-dev \
1819
libjpeg-turbo-dev \
1920
libpng-dev \
2021
; \
2122
\
22-
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
23+
docker-php-ext-configure gd \
24+
--with-freetype-dir=/usr \
25+
--with-jpeg-dir=/usr \
26+
--with-png-dir=/usr \
27+
; \
2328
docker-php-ext-install -j "$(nproc)" \
2429
bcmath \
2530
exif \

0 commit comments

Comments
 (0)