Skip to content

Commit c63f536

Browse files
J0WIJ0WI
committed
Fix gd extension in 7.4
1 parent 996d18e commit c63f536

File tree

16 files changed

+22
-75
lines changed

16 files changed

+22
-75
lines changed

‎Dockerfile-alpine.template

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ RUN set -ex; \
2121
libzip-dev \
2222
; \
2323
\
24-
docker-php-ext-configure gd \
25-
--with-freetype-dir=/usr \
26-
--with-jpeg-dir=/usr \
27-
--with-png-dir=/usr \
28-
; \
24+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
2925
docker-php-ext-install -j "$(nproc)" \
3026
bcmath \
3127
exif \

‎Dockerfile-cli.template

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ RUN set -ex; \
1212
libzip-dev \
1313
; \
1414
\
15-
docker-php-ext-configure gd \
16-
--with-freetype-dir=/usr \
17-
--with-jpeg-dir=/usr \
18-
--with-png-dir=/usr \
19-
; \
15+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
2016
docker-php-ext-install -j "$(nproc)" \
2117
bcmath \
2218
exif \

‎Dockerfile-debian.template

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ RUN set -ex; \
2323
libzip-dev \
2424
; \
2525
\
26-
docker-php-ext-configure gd \
27-
--with-freetype-dir=/usr \
28-
--with-jpeg-dir=/usr \
29-
--with-png-dir=/usr \
30-
; \
26+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
3127
docker-php-ext-install -j "$(nproc)" \
3228
bcmath \
3329
exif \

‎php7.2/apache/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ RUN set -ex; \
2222
libpng-dev \
2323
; \
2424
\
25-
docker-php-ext-configure gd \
26-
--with-freetype-dir=/usr \
27-
--with-jpeg-dir=/usr \
28-
--with-png-dir=/usr \
29-
; \
25+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
3026
docker-php-ext-install -j "$(nproc)" \
3127
bcmath \
3228
exif \

‎php7.2/cli/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ RUN set -ex; \
1111
libpng-dev \
1212
; \
1313
\
14-
docker-php-ext-configure gd \
15-
--with-freetype-dir=/usr \
16-
--with-jpeg-dir=/usr \
17-
--with-png-dir=/usr \
18-
; \
14+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
1915
docker-php-ext-install -j "$(nproc)" \
2016
bcmath \
2117
exif \

‎php7.2/fpm-alpine/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ RUN set -ex; \
2020
libpng-dev \
2121
; \
2222
\
23-
docker-php-ext-configure gd \
24-
--with-freetype-dir=/usr \
25-
--with-jpeg-dir=/usr \
26-
--with-png-dir=/usr \
27-
; \
23+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
2824
docker-php-ext-install -j "$(nproc)" \
2925
bcmath \
3026
exif \

‎php7.2/fpm/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ RUN set -ex; \
2222
libpng-dev \
2323
; \
2424
\
25-
docker-php-ext-configure gd \
26-
--with-freetype-dir=/usr \
27-
--with-jpeg-dir=/usr \
28-
--with-png-dir=/usr \
29-
; \
25+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
3026
docker-php-ext-install -j "$(nproc)" \
3127
bcmath \
3228
exif \

‎php7.3/apache/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ RUN set -ex; \
2323
libzip-dev \
2424
; \
2525
\
26-
docker-php-ext-configure gd \
27-
--with-freetype-dir=/usr \
28-
--with-jpeg-dir=/usr \
29-
--with-png-dir=/usr \
30-
; \
26+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
3127
docker-php-ext-install -j "$(nproc)" \
3228
bcmath \
3329
exif \

‎php7.3/cli/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ RUN set -ex; \
1212
libzip-dev \
1313
; \
1414
\
15-
docker-php-ext-configure gd \
16-
--with-freetype-dir=/usr \
17-
--with-jpeg-dir=/usr \
18-
--with-png-dir=/usr \
19-
; \
15+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
2016
docker-php-ext-install -j "$(nproc)" \
2117
bcmath \
2218
exif \

‎php7.3/fpm-alpine/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ RUN set -ex; \
2121
libzip-dev \
2222
; \
2323
\
24-
docker-php-ext-configure gd \
25-
--with-freetype-dir=/usr \
26-
--with-jpeg-dir=/usr \
27-
--with-png-dir=/usr \
28-
; \
24+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
2925
docker-php-ext-install -j "$(nproc)" \
3026
bcmath \
3127
exif \

‎php7.3/fpm/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ RUN set -ex; \
2323
libzip-dev \
2424
; \
2525
\
26-
docker-php-ext-configure gd \
27-
--with-freetype-dir=/usr \
28-
--with-jpeg-dir=/usr \
29-
--with-png-dir=/usr \
30-
; \
26+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr; \
3127
docker-php-ext-install -j "$(nproc)" \
3228
bcmath \
3329
exif \

‎php7.4/apache/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ RUN set -ex; \
2323
libzip-dev \
2424
; \
2525
\
26-
docker-php-ext-configure gd \
27-
--with-freetype-dir=/usr \
28-
--with-jpeg-dir=/usr \
29-
--with-png-dir=/usr \
30-
; \
26+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
3127
docker-php-ext-install -j "$(nproc)" \
3228
bcmath \
3329
exif \

‎php7.4/cli/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ RUN set -ex; \
1212
libzip-dev \
1313
; \
1414
\
15-
docker-php-ext-configure gd \
16-
--with-freetype-dir=/usr \
17-
--with-jpeg-dir=/usr \
18-
--with-png-dir=/usr \
19-
; \
15+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
2016
docker-php-ext-install -j "$(nproc)" \
2117
bcmath \
2218
exif \

‎php7.4/fpm-alpine/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ RUN set -ex; \
2121
libzip-dev \
2222
; \
2323
\
24-
docker-php-ext-configure gd \
25-
--with-freetype-dir=/usr \
26-
--with-jpeg-dir=/usr \
27-
--with-png-dir=/usr \
28-
; \
24+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
2925
docker-php-ext-install -j "$(nproc)" \
3026
bcmath \
3127
exif \

‎php7.4/fpm/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ RUN set -ex; \
2323
libzip-dev \
2424
; \
2525
\
26-
docker-php-ext-configure gd \
27-
--with-freetype-dir=/usr \
28-
--with-jpeg-dir=/usr \
29-
--with-png-dir=/usr \
30-
; \
26+
docker-php-ext-configure gd --with-freetype --with-jpeg; \
3127
docker-php-ext-install -j "$(nproc)" \
3228
bcmath \
3329
exif \

‎update.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ for phpVersion in "${phpVersions[@]}"; do
8080
"$dir/Dockerfile"
8181
;;
8282
esac
83+
case "$phpVersion" in
84+
7.2 | 7.3 )
85+
sed -ri \
86+
-e 's!gd --with-freetype --with-jpeg!gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr!g' \
87+
"$dir/Dockerfile"
88+
;;
89+
esac
8390

8491
cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
8592

0 commit comments

Comments
 (0)