parent
7c76d97d04
commit
9131c0fded
|
@ -1,4 +1,4 @@
|
|||
FROM arm64v8/php:7.4.1-fpm-buster
|
||||
FROM arm64v8/php:7.4.1-apache-buster
|
||||
|
||||
RUN set -ex; \
|
||||
\
|
||||
|
@ -56,6 +56,15 @@ RUN echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
|
|||
chown -R www-data:root /var/www; \
|
||||
chmod -R g=u /var/www
|
||||
|
||||
RUN a2enmod rewrite remoteip ;\
|
||||
{\
|
||||
echo RemoteIPHeader X-Real-IP ;\
|
||||
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
|
||||
echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
|
||||
echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
|
||||
} > /etc/apache2/conf-available/remoteip.conf;\
|
||||
a2enconf remoteip
|
||||
|
||||
RUN mkdir /scratch
|
||||
|
||||
WORKDIR /scratch
|
||||
|
@ -82,8 +91,7 @@ RUN chown -R www-data:root /var/www; \
|
|||
|
||||
USER www-data
|
||||
RUN rm -rf /var/www/html
|
||||
RUN git clone -b $TAG https://github.com/pixelfed/pixelfed /var/www/pixelfed; \
|
||||
ln -s /var/www/pixelfed/public /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; \
|
||||
|
@ -95,7 +103,7 @@ RUN apt-get update; \
|
|||
|
||||
USER www-data
|
||||
|
||||
WORKDIR /var/www/pixelfed
|
||||
WORKDIR /var/www/html
|
||||
|
||||
RUN composer install \
|
||||
--no-ansi \
|
||||
|
@ -115,9 +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
|
||||
|
||||
RUN echo "chdir = /var/www/html" >> /usr/local/etc/php-fpm.d/www.conf
|
||||
VOLUME /var/www/html/storage
|
||||
|
||||
VOLUME /var/www/pixelfed/storage
|
||||
|
||||
ENTRYPOINT ["tini", "--"]
|
||||
CMD ["pixelfed-startup", "php-fpm"]
|
||||
ENTRYPOINT ["/usr/bin/tini", "--"]
|
||||
CMD ["/usr/local/bin/pixelfed-startup", "/usr/local/bin/apache2-foreground"]
|
||||
|
|
Loading…
Reference in a new issue