From 0e88d354a6a880bccf7a7eed5f4a524d00e9bf01 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 8 Jun 2020 20:50:42 +0200 Subject: [PATCH] use composer from distro. --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2935bd..d4912b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,13 @@ FROM reg.zknt.org/zknt/debian-php as builder RUN set -xe;\ - apt-install git php-curl php-zip php-bcmath php-intl php-mbstring php-xml &&\ - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&\ - php -r "if (hash_file('sha384', 'composer-setup.php') === 'e0012edf3e80b6978849f5eff0d4b4e4c79ff1609dd1e613307e16318854d24ae64f26d17af3ef0bf7cfb710ca74755a') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" &&\ - php composer-setup.php &&\ - php -r "unlink('composer-setup.php');" &&\ - php composer.phar global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist &&\ + apt-install git php-curl php-zip php-bcmath php-intl php-mbstring php-xml composer &&\ + composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist &&\ cd /var && rm -rf www &&\ git clone https://github.com/pixelfed/pixelfed.git www &&\ cd www &&\ curl -L https://github.com/hnrd/pixelfed/commit/6e822b67c50dfb6cc6dc352ce80bf3326b06cca9.patch | git apply &&\ - php /composer.phar install --prefer-dist --no-interaction --no-ansi --optimize-autoloader &&\ + composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader &&\ ln -s public html &&\ chown -R www-data:www-data /var/www &&\ cp -r storage storage.skel &&\