Add new modules

src/debian/Dockerfile.apache.tpl

@@ -20,4 +20,4 @@ RUN { \
                 echo '</VirtualHost>'; \
 	} | tee /etc/apache2/sites-available/000-default.conf && \
     echo "ServerName localhost" > /etc/apache2/conf-available/fqdn.conf && \
-    a2enmod rewrite expires remoteip cgid
+    a2enmod rewrite expires remoteip cgid headers

src/debian/Dockerfile.php.tpl

@@ -1,43 +1,20 @@
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/install-php-extensions
+
 # Install default PHP Extensions
-RUN docker-php-ext-install -j$(nproc) \
+RUN install-php-extensions \
 		bcmath \
 		mysqli \
 		pdo \
-		pdo_mysql
-
-# Install Intl, LDAP, GD, SOAP, Tidy, XSL, Zip PHP Extensions
-ARG GD_BUILD_ARGS="--with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/"
-RUN apt-get update -y && apt-get install -y \
-        zlib1g-dev \
-        libicu-dev \
-        g++ \
-        libldap2-dev \
-        libgd-dev \
-        libzip-dev \
-        libtidy-dev \
-        libxml2-dev \
-        libxslt-dev \
-        zip \
-    --no-install-recommends && \
-    apt-mark auto \
-        zlib1g-dev \
-        g++ \
-        libldap2-dev \
-        libxml2-dev \
-        libxslt-dev && \
-    docker-php-ext-configure intl && \
-    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
-    docker-php-ext-configure gd ${GD_BUILD_ARGS:-}&& \
-    docker-php-ext-install -j$(nproc) \
+		pdo_mysql \
         intl \
         ldap \
         gd \
         soap \
         tidy \
         xsl \
-        zip && \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
-	rm -rf /var/lib/apt/lists/*
+        zip \
+        exif \
+        gmp
 
 # Pipe errors to stdErr
 RUN echo "date.timezone = Pacific/Auckland" > /usr/local/etc/php/conf.d/timezone.ini && \