From a9a5f113ee2646dc99b3f3771767263ef865a9f4 Mon Sep 17 00:00:00 2001 From: asonix Date: Wed, 15 Jan 2020 15:20:51 -0600 Subject: [PATCH] Pull in rsync, move to /var/www/html --- pixelfed/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pixelfed/Dockerfile b/pixelfed/Dockerfile index 203c445..1122986 100644 --- a/pixelfed/Dockerfile +++ b/pixelfed/Dockerfile @@ -90,19 +90,20 @@ RUN chown -R www-data:root /var/www; \ find /var/www -type f -exec chmod 644 {} \; USER www-data -RUN git clone -b $TAG https://github.com/pixelfed/pixelfed /var/www/pixelfed +RUN rm -rf /var/www/html +RUN git clone -b $TAG https://github.com/pixelfed/pixelfed /var/www/html USER root RUN apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ rm -rf /var/lib/apt/lists/* RUN apt-get update; \ - apt-get install -y pngquant jpegoptim optipng tini unzip; \ + apt-get install -y pngquant jpegoptim optipng tini unzip rsync; \ rm -rf /var/lib/apt/lists/* USER www-data -WORKDIR /var/www/pixelfed +WORKDIR /var/www/html RUN composer install \ --no-ansi \ @@ -122,7 +123,7 @@ COPY pixelfed-startup /usr/local/bin/pixelfed-startup COPY pixelfed-migrate /usr/local/bin/pixelfed-migrate COPY pixelfed-garbage /usr/local/bin/pixelfed-garbage -VOLUME /var/www/pixelfed/storage +VOLUME /var/www/html/storage ENTRYPOINT ["/usr/bin/tini", "--"] CMD ["/usr/local/bin/pixelfed-startup", "/usr/local/bin/apache2-foreground"]