upgrade to 19.8

This commit is contained in:
2019-08-17 12:49:19 +02:00
parent e51868fb63
commit 5260e94007
3 changed files with 24 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
FROM nginx:1.15.12-alpine FROM nginx:1.17.3-alpine
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
@@ -25,8 +25,11 @@ RUN \
EXPOSE 80 443 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 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 nginx.conf /etc/nginx/conf.d/default.conf
COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.conf COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.conf
COPY install-db.php /var/lib/tt-rss-install/install-db.php COPY install-db.php /var/lib/tt-rss-install/install-db.php

View File

@@ -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 plugin:install https://github.com/dokku/dokku-postgres.git
dokku apps:create ttrss dokku apps:create ttrss
dokku ps:scale ttrss web=0
dokku postgres:create ttrssdb_11_2 dokku postgres:create ttrssdb_11_2
dokku postgres:link ttrssdb_11_2 ttrss dokku postgres:link ttrssdb_11_2 ttrss
dokku config:set ttrss SELF_URL_PATH=http://ttrss.example.com/ 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 git push dokku
dokku run ttrss php7 /var/lib/tt-rss-install/install-db.php dokku run ttrss php7 /var/lib/tt-rss-install/install-db.php
dokku ps:scale ttrss web=1
``` ```
## HTTPS ## HTTPS
@@ -42,10 +44,12 @@ dokku letsencrypt:auto-renew ttrss
### 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 ```bash
dokku postgres:export ttrssdb_11_2 > ttrss.db dokku postgres:export ttrssdb_11_4 > ttrss.db
git push dokku git push dokku
# go to Tiny Tiny RSS, it will ask to upgrade database, do it and check app is working # go to Tiny Tiny RSS, it will ask to upgrade database, do it and check app is working
rm ttrss.db rm ttrss.db
@@ -54,11 +58,13 @@ rm ttrss.db
### Database ### Database
```bash ```bash
# upgrade from Postgres 10.2 to 11.2 # upgrade from Postgres 10.2 to 11.4
dokku plugins:upgrade postgres dokku plugins:upgrade postgres
dokku postgres:clone ttrssdb_10_2 ttrssdb_11_2 dokku postgres:create ttrssdb_11_4
dokku postgres:link ttrssdb_11_2 ttrss dokku postgres:export ttrssdb_10_2 > ttrss.db
dokku postgres:promote ttrssdb_11_2 ttrss 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 # check app is working, then delete old database
dokku postgres:unlink ttrssdb_10_2 ttrss dokku postgres:unlink ttrssdb_10_2 ttrss

View File

@@ -20,12 +20,14 @@
// *********************************** // ***********************************
define('SELF_URL_PATH', getenv('SELF_URL_PATH')); define('SELF_URL_PATH', getenv('SELF_URL_PATH'));
// Full URL of your tt-rss installation. This should be set to the // This should be set to a fully qualified URL used to access
// location of tt-rss directory, e.g. http://example.org/tt-rss/ // your tt-rss instance over the net.
// You need to set this option correctly otherwise several features // The value should be a constant string literal. Please don't use
// including PUSH, bookmarklets and browser integration will not work properly. // 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 // Operate in single user mode, disables all functionality related to
// multiple users and authentication. Enabling this assumes you have // multiple users and authentication. Enabling this assumes you have
// your tt-rss directory protected by other means (e.g. http auth). // your tt-rss directory protected by other means (e.g. http auth).