From aede31ea657c2f1209e259178d76df8624d80d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Str=C3=A4ssle?= Date: Sun, 9 Feb 2020 18:07:42 +0100 Subject: [PATCH] Parallel composer install in Dockerfile and Dockerfile.fpm fix --- contrib/docker/Dockerfile.apache | 2 ++ contrib/docker/Dockerfile.fpm | 3 +++ 2 files changed, 5 insertions(+) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index d34704a5e..18da11fc8 100644 --- a/contrib/docker/Dockerfile.apache +++ b/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 diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index cbdd1c0a2..721eac058 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -1,3 +1,4 @@ +FROM php:7.4-fpm-buster ARG COMPOSER_VERSION="1.9.1" ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111" @@ -32,7 +33,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