Merge branch 'php7dot4' into php8dot0

Author: lucassabreu

Dockerfile

@@ -16,20 +16,20 @@ ENV XDEBUG_AUTOSTART=false
 ENV XDEBUG_CONNECT_BACK=true
 ENV XDEBUG_ENABLED=false
 ENV XDEBUG_IDEKEY="docker"
-ENV XDEBUG_VERSION=""
+ENV XDEBUG_VERSION="-3.2.1"
 ENV XDEBUG_REMOTE_PORT=9000
 ENV PHP_EXTENSION_WDDX=1
 ENV PHP_OPENSSL=1
 
-RUN apt-get update && apt-get install -y --no-install-recommends wget vim supervisor libfreetype6-dev libjpeg62-turbo-dev \
+RUN apt-get update && apt-get install -y --no-install-recommends wget vim supervisor libfreetype6-dev libjpeg-dev libjpeg62-turbo-dev \
     libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
     libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev \
     sudo zlib1g zlib1g-dev libzip4 libzip-dev zip unzip librabbitmq-dev musl-dev && \
     rm -rf /var/lib/apt/lists/*
 
 RUN a2enmod rewrite unique_id
 
-RUN docker-php-ext-configure gd \
+RUN docker-php-ext-configure gd --with-jpeg \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install -j$(nproc) bcmath gd pdo_mysql calendar exif gettext shmop soap sockets intl pcntl xsl ldap imap
@@ -65,7 +65,7 @@ RUN echo "---> Adding NewRelic" && \
     && sudo apt-get update && apt-get install -y -q --no-install-recommends --no-install-suggests newrelic-php5 \
     && NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=1 newrelic-install install \
     && chown www-data:www-data /usr/local/etc/php/conf.d/newrelic.ini && chmod a+rw /usr/local/etc/php/conf.d/newrelic.ini \
-    && apt-get remove -y gnupg2 && rm -rf /var/lib/apt/lists/*\
+    && apt-get remove -y gnupg2 && rm -rf /var/lib/apt/lists/* \
     && echo "newrelic.distributed_tracing_enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini
 
 RUN echo "---> Adding Tini" && \