asonix/docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pull in rsync, move to /var/www/html

Browse source
This commit is contained in:
asonix 2020-01-15 15:20:51 -06:00
parent 7e12d97855
commit a9a5f113ee
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pixelfed/Dockerfile
View file

@ -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"]