From af76d066c9557bbde28898635f81d5889f04622d Mon Sep 17 00:00:00 2001
From: Aleksander Cynarski <aleksander@cynarski.pl>
Date: Mon, 14 Jun 2021 18:26:16 +0200
Subject: [PATCH] add php_configure extensions helper

---
 Dockerfile                            | 12 ++++++------
 docker/usr/local/bin/php_configure.sh | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100755 docker/usr/local/bin/php_configure.sh

diff --git a/Dockerfile b/Dockerfile
index 3d52dc0..c484a9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,11 +31,11 @@ RUN apk add --no-cache wget \
     jpeg-dev \
     libjpeg-turbo-dev
 
-RUN docker-php-ext-configure gd \
-        --with-freetype-dir=/usr/lib/ \
-        --with-png-dir=/usr/lib/ \
-        --with-jpeg-dir=/usr/lib/ \
-        --with-gd
+COPY docker/ /
+
+# Configure php extensions
+RUN /usr/local/bin/php_configure.sh
+
 
 # Install php extensions
 RUN docker-php-ext-install -j$(nproc) \
@@ -74,7 +74,7 @@ FROM php:${PHP_VERSION}
 ARG ENVIRONMENT=production
 
 # install system libs
-RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libzip shadow sudo
+RUN apk add --no-cache libintl c-client libpng icu-libs libldap libpq libjpeg freetype libzip shadow sudo
 
 # Install apps
 RUN apk add --no-cache wget curl bash git openssh supervisor nginx openssl zip 
diff --git a/docker/usr/local/bin/php_configure.sh b/docker/usr/local/bin/php_configure.sh
new file mode 100755
index 0000000..9e8fad9
--- /dev/null
+++ b/docker/usr/local/bin/php_configure.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PHP_VERSION=`php -r 'echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;'`
+
+if [ $PHP_VERSION = '74' ]; then 
+	docker-php-ext-configure gd --with-freetype --with-jpeg
+else 
+	docker-php-ext-configure gd \
+        --with-freetype-dir=/usr/lib/ \
+        --with-png-dir=/usr/lib/ \
+        --with-jpeg-dir=/usr/lib/ \
+        --with-gd
+fi
\ No newline at end of file