diff --git a/Dockerfile b/Dockerfile index 0cb2679..4eab1cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.15.12-alpine +FROM nginx:1.17.3-alpine RUN \ apk add --no-cache \ @@ -25,8 +25,11 @@ RUN \ EXPOSE 80 443 -ADD https://git.tt-rss.org/fox/tt-rss/archive/19.2.tar.gz /tmp/ttrss.tar.gz +WORKDIR /app COPY CHECKS /app/CHECKS + +ADD https://git.tt-rss.org/fox/tt-rss/archive/19.8.tar.gz /tmp/ttrss.tar.gz + COPY nginx.conf /etc/nginx/conf.d/default.conf COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.conf COPY install-db.php /var/lib/tt-rss-install/install-db.php diff --git a/Readme.md b/Readme.md index 2303d02..c24d734 100644 --- a/Readme.md +++ b/Readme.md @@ -8,6 +8,7 @@ Runs as a [Dockerfile deployment](http://dokku.viewdocs.io/dokku/deployment/meth dokku plugin:install https://github.com/dokku/dokku-postgres.git dokku apps:create ttrss +dokku ps:scale ttrss web=0 dokku postgres:create ttrssdb_11_2 dokku postgres:link ttrssdb_11_2 ttrss dokku config:set ttrss SELF_URL_PATH=http://ttrss.example.com/ @@ -16,6 +17,7 @@ git remote add dokku dokku@example.com:ttrrs git push dokku dokku run ttrss php7 /var/lib/tt-rss-install/install-db.php +dokku ps:scale ttrss web=1 ``` ## HTTPS @@ -42,10 +44,12 @@ dokku letsencrypt:auto-renew ttrss ### TTRSS -Check for updates in [config.php-dist](https://git.tt-rss.org/fox/tt-rss/commits/master/config.php-dist) and propagate them in `config.php`. In `Dockerfile`, update nginx base image and TTRSS release. +* Upgrade base image in `Dockerfile`: https://hub.docker.com/_/nginx?tab=tags +* Upgrade TTRSS release in `Dockerfile` +* Propagate updates in `config.php-dist` to `config.php`: https://git.tt-rss.org/fox/tt-rss/src/19.8/config.php-dist ```bash -dokku postgres:export ttrssdb_11_2 > ttrss.db +dokku postgres:export ttrssdb_11_4 > ttrss.db git push dokku # go to Tiny Tiny RSS, it will ask to upgrade database, do it and check app is working rm ttrss.db @@ -54,11 +58,13 @@ rm ttrss.db ### Database ```bash -# upgrade from Postgres 10.2 to 11.2 +# upgrade from Postgres 10.2 to 11.4 dokku plugins:upgrade postgres -dokku postgres:clone ttrssdb_10_2 ttrssdb_11_2 -dokku postgres:link ttrssdb_11_2 ttrss -dokku postgres:promote ttrssdb_11_2 ttrss +dokku postgres:create ttrssdb_11_4 +dokku postgres:export ttrssdb_10_2 > ttrss.db +dokku postgres:import ttrssdb_11_4 < ttrss.db +dokku postgres:link ttrssdb_11_4 ttrss +dokku postgres:promote ttrssdb_11_4 ttrss # check app is working, then delete old database dokku postgres:unlink ttrssdb_10_2 ttrss diff --git a/config.php b/config.php index 76caa86..c652ed3 100644 --- a/config.php +++ b/config.php @@ -20,12 +20,14 @@ // *********************************** define('SELF_URL_PATH', getenv('SELF_URL_PATH')); - // 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/ - // You need to set this option correctly otherwise several features - // including PUSH, bookmarklets and browser integration will not work properly. + // This should be set to a fully qualified URL used to access + // your tt-rss instance over the net. + // The value should be a constant string literal. Please don't use + // PHP server variables here - you might introduce security + // issues on your install and cause hard to debug problems. + // If your tt-rss instance is behind a reverse proxy, use the external URL. - define('SINGLE_USER_MODE', true); + define('SINGLE_USER_MODE', false); // Operate in single user mode, disables all functionality related to // multiple users and authentication. Enabling this assumes you have // your tt-rss directory protected by other means (e.g. http auth).