bunix42/docker-ttrss
1
0
Fork 0
Code Releases Activity

Merge 09cba4140a into d2e34cd59d

Browse Source
This commit is contained in:
Vitalii Vokhmin
2015-02-12 12:29:42 +00:00
parent d2e34cd59d 09cba4140a
commit 2870d8d8e5
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+16 -3
View File
@@ -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
configure-db.php
+1 -1
View File
@@ -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, ' ;');