Merge 09cba4140a90cceac920f4f99ecb05a7b5615518 into d2e34cd59d0f9513f669f54235b1e4852a845bf1
This commit is contained in:
commit
2870d8d8e5
19
Dockerfile
19
Dockerfile
@ -13,12 +13,25 @@ ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
|
|||||||
RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
|
RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
|
||||||
RUN rm /etc/nginx/sites-enabled/default
|
RUN rm /etc/nginx/sites-enabled/default
|
||||||
|
|
||||||
|
ENV CODE_DIR /var/www
|
||||||
|
|
||||||
# install ttrss and patch configuration
|
# install ttrss and patch configuration
|
||||||
RUN git clone https://github.com/gothfox/Tiny-Tiny-RSS.git /var/www
|
RUN git clone https://github.com/gothfox/Tiny-Tiny-RSS.git $CODE_DIR
|
||||||
WORKDIR /var/www
|
WORKDIR $CODE_DIR
|
||||||
RUN cp config.php-dist config.php
|
RUN cp config.php-dist config.php
|
||||||
RUN sed -i -e "/'SELF_URL_PATH'/s/ '.*'/ 'http:\/\/localhost\/'/" config.php
|
RUN sed -i -e "/'SELF_URL_PATH'/s/ '.*'/ 'http:\/\/localhost\/'/" config.php
|
||||||
RUN chown www-data:www-data -R /var/www
|
RUN chown www-data:www-data -R $CODE_DIR
|
||||||
|
|
||||||
|
# install feedly theme
|
||||||
|
WORKDIR $CODE_DIR/themes
|
||||||
|
RUN git clone https://github.com/levito/tt-rss-feedly-theme.git
|
||||||
|
RUN ln -s tt-rss-feedly-theme/feedly.css
|
||||||
|
RUN ln -s tt-rss-feedly-theme/feedly
|
||||||
|
|
||||||
|
# install videoframes plugin
|
||||||
|
WORKDIR $CODE_DIR/plugins
|
||||||
|
RUN git clone https://github.com/tribut/ttrss-videoframes.git
|
||||||
|
RUN ln -s ttrss-videoframes/videoframes
|
||||||
|
|
||||||
# expose only nginx HTTP port
|
# expose only nginx HTTP port
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
@ -87,7 +87,7 @@ try {
|
|||||||
}
|
}
|
||||||
catch (PDOException $e) {
|
catch (PDOException $e) {
|
||||||
echo 'Database table not found, applying schema... ' . PHP_EOL;
|
echo 'Database table not found, applying schema... ' . PHP_EOL;
|
||||||
$schema = file_get_contents('schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql');
|
$schema = file_get_contents('/var/www/schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql');
|
||||||
$schema = preg_replace('/--(.*?);/', '', $schema);
|
$schema = preg_replace('/--(.*?);/', '', $schema);
|
||||||
$schema = preg_replace('/[\r\n]/', ' ', $schema);
|
$schema = preg_replace('/[\r\n]/', ' ', $schema);
|
||||||
$schema = trim($schema, ' ;');
|
$schema = trim($schema, ' ;');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user