Dominik Strässle 8f93390a2e Fix breaking docker build ... The Dockerfile.apache has been updated recently, but Dockerfile.fpm not. Due to this, the docker build is failing with the following error: ``` configure: error: unrecognized options: --enable-freetype The command '/bin/sh -c apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get install -y --no-install-recommends git gosu optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client && sed -i '/en_US/s/^#//g' /etc/locale.gen && locale-gen && update-locale && docker-php-source extract && docker-php-ext-configure gd --enable-freetype --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ --with-webp-dir=/usr/lib/x86_64-linux-gnu/ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl && pecl install imagick && docker-php-ext-enable imagick pcntl imagick gd exif zip curl && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer && echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - && chmod 755 /usr/bin/composer && apt-get autoremove --purge -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev && rm -rf /var/cache/apt && docker-php-source delete' returned a non-zero code: 1 ``` This change updates Dockerfile.fpm to equal the Dockerfile.apache variant. (Except the fpm or apache specific settings)		2020-02-09 17:49:12 +01:00
..
docker	Fix breaking docker build	2020-02-09 17:49:12 +01:00
nginx.conf	Update nginx.conf	2019-10-26 01:04:28 -04:00