blallo/Feedati
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

tt-rss moved to /tt-rss/

Browse source 
also, state dirs are moved to /var/cache/ and /var/lock/, thus avoiding
their unneeded "copy" to host.
ICONS_DIR is still pointing to documentroot, so this is not yet
complete.
This commit is contained in:
boyska 2018-08-09 23:51:31 +02:00
parent ff59b1cf3e
commit efbcbc8204
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -20,8 +20,8 @@ services:
dockerfile: ./docker/Dockerfile-tt-rss dockerfile: ./docker/Dockerfile-tt-rss
container_name: feedati_tt_rss container_name: feedati_tt_rss
volumes: volumes:
- ./tt-rss:/app/public/ - ./tt-rss:/app/public/tt-rss/
- ./docker/ttrss-config.php:/app/public/config.php:ro - ./docker/ttrss-config.php:/app/public/tt-rss/config.php:ro
ports: ports:
- 8000:80 - 8000:80
- 9312:9312 - 9312:9312

7
docker/Dockerfile-tt-rss
View file

@ -1,4 +1,7 @@
FROM ulsmith/alpine-apache-php7 FROM ulsmith/alpine-apache-php7
RUN apk add --update php7-pgsql php7-fileinfo && apk del php7-pdo_mysql php7-pdo_odbc php7-pdo_sqlite db php7-redis php7-ftp && rm -rf /var/cache/apk/ RUN apk add --update php7-pgsql php7-fileinfo && apk del php7-pdo_mysql php7-pdo_odbc php7-pdo_sqlite db php7-redis php7-ftp && rm -rf /var/cache/apk/
COPY tt-rss/* /app/public/ RUN mkdir -p /app/public/tt-rss/ /var/cache/tt-rss/images /var/cache/tt-rss/upload /var/cache/tt-rss/export /var/cache/tt-rss/js /var/lock/tt-rss/
RUN chown -R apache:root /app/public RUN chown -R apache:root /app/public /var/cache/tt-rss/ /var/lock/tt-rss/
COPY tt-rss/* /app/public/tt-rss/
# vim: set ft=dockerfile:

2
docker/nginx.conf
View file

@ -8,7 +8,7 @@ server {
location /tt-rss { location /tt-rss {
resolver 127.0.0.11 ipv6=off; resolver 127.0.0.11 ipv6=off;
proxy_pass http://tt-rss/; proxy_pass http://tt-rss/tt-rss;
proxy_read_timeout 60s; proxy_read_timeout 60s;
proxy_connect_timeout 4s; proxy_connect_timeout 4s;
proxy_set_header Host $host; proxy_set_header Host $host;

6
docker/ttrss-config.php
View file

@ -18,7 +18,7 @@
// *** Basic settings (important!) *** // *** Basic settings (important!) ***
// *********************************** // ***********************************
define('SELF_URL_PATH', 'http://localhost'); define('SELF_URL_PATH', 'http://localhost/tt-rss/');
// Full URL of your tt-rss installation. This should be set to the // Full URL of your tt-rss installation. This should be set to the
// location of tt-rss directory, e.g. http://example.org/tt-rss/ // location of tt-rss directory, e.g. http://example.org/tt-rss/
// You need to set this option correctly otherwise several features // You need to set this option correctly otherwise several features
@ -61,11 +61,11 @@
// then most probably you are using the CGI binary. If you are unsure what to // then most probably you are using the CGI binary. If you are unsure what to
// put in here, ask your hosting provider. // put in here, ask your hosting provider.
define('LOCK_DIRECTORY', 'lock'); define('LOCK_DIRECTORY', '/var/lock/tt-rss');
// Directory for lockfiles, must be writable to the user you run // Directory for lockfiles, must be writable to the user you run
// daemon process or cronjobs under. // daemon process or cronjobs under.
define('CACHE_DIR', 'cache'); define('CACHE_DIR', '/var/cache/tt-rss');
// Local cache directory for RSS feed content. // Local cache directory for RSS feed content.
define('ICONS_DIR', "feed-icons"); define('ICONS_DIR', "feed-icons");

3
dodo.py
View file

@ -84,8 +84,7 @@ def task__fix_perms():
'''fix permissions for shared www dir''' '''fix permissions for shared www dir'''
return { return {
'actions': [ 'actions': [
'chmod -R 777 tt-rss/feed-icons/ tt-rss/cache/ tt-rss/lock/' 'chmod -R 777 tt-rss/feed-icons/ || true'
.split()
] ]
} }