Merge branch 'master' of git.tt-rss.org:fox/ttrss-docker-compose
This commit is contained in:
commit
72f97942a9
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
The idea is to provide tt-rss working (and updating) out of the box with minimal fuss.
|
The idea is to provide tt-rss working (and updating) out of the box with minimal fuss.
|
||||||
|
|
||||||
This setup is still WIP. Some features may be unimplemented or broken. Check the following
|
|
||||||
before deploying:
|
|
||||||
|
|
||||||
- [TODO](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki/TODO)
|
- [TODO](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki/TODO)
|
||||||
- [FAQ](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki#faq)
|
- [FAQ](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki#faq)
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ ADD updater.sh /
|
||||||
ADD index.php /
|
ADD index.php /
|
||||||
|
|
||||||
RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf
|
RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf
|
||||||
|
RUN sed -i.bak 's/\(memory_limit =\) 128M/\1 256M/' /etc/php7/php.ini
|
||||||
|
|
||||||
RUN mkdir -p /var/www
|
RUN mkdir -p /var/www
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,8 @@ else
|
||||||
-i.bak $DST_DIR/config.php
|
-i.bak $DST_DIR/config.php
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cd $DST_DIR && sudo -u app php ./update.php --update-schema force-yes
|
||||||
|
|
||||||
touch $DST_DIR/.app_is_ready
|
touch $DST_DIR/.app_is_ready
|
||||||
|
|
||||||
sudo -u app /usr/sbin/php-fpm7 -F
|
sudo -u app /usr/sbin/php-fpm7 -F
|
||||||
|
|
Loading…
Reference in New Issue