Merge pull request #1996 from dominikstraessle/patch-1

Fix breaking docker build & Optimize docker build time

contrib/docker/Dockerfile.apache

@@ -43,7 +43,9 @@ COPY . /var/www/
 WORKDIR /var/www/
 RUN cp -r storage storage.skel \
  && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
+ && composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
  && composer install --prefer-dist --no-interaction \
+ && composer global remove hirak/prestissimo \
  && rm -rf html && ln -s public html
 
 VOLUME /var/www/storage /var/www/bootstrap

contrib/docker/Dockerfile.fpm

@@ -1,7 +1,6 @@
-FROM php:7.3-fpm-buster
-
-ARG COMPOSER_VERSION="1.8.5"
-ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17"
+FROM php:7.4-fpm-buster
+ARG COMPOSER_VERSION="1.9.1"
+ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends apt-utils \
@@ -13,13 +12,12 @@ RUN apt-get update \
  && 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/ \
+      --with-freetype \
+      --with-jpeg \
+      --with-webp \
+      --with-xpm \
  && 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 \
+ && docker-php-ext-enable pcntl 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 \
@@ -33,9 +31,11 @@ ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
 COPY . /var/www/
 
 WORKDIR /var/www/
-RUN mkdir public.ext && cp -r storage storage.skel \
+RUN cp -r storage storage.skel \
  && cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
+ && composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
  && composer install --prefer-dist --no-interaction \
+ && composer global remove hirak/prestissimo \
  && rm -rf html && ln -s public html
 
 VOLUME /var/www/storage /var/www/bootstrap
@@ -59,7 +59,6 @@ ENV APP_ENV=production \
     ACTIVITY_PUB=false
 
 CMD cp -r storage.skel/* storage/ \
- && cp -r public/* public.ext/ \
  && chown -R www-data:www-data storage/ \
  && php artisan storage:link \
  && php artisan migrate --force \