From 968819a855ab27ea28684d0e54cde8155745607a Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sat, 21 Feb 2015 15:48:03 +0100 Subject: [PATCH] Set SELF_URL_PATH on runtime --- Dockerfile | 4 +++- README.md | 9 +++++++++ configure-db.php | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49fed7a..4ef2819 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,12 +17,14 @@ RUN rm /etc/nginx/sites-enabled/default RUN git clone https://github.com/gothfox/Tiny-Tiny-RSS.git /var/www WORKDIR /var/www RUN cp config.php-dist config.php -RUN sed -i -e "/'SELF_URL_PATH'/s/ '.*'/ 'http:\/\/localhost\/'/" config.php RUN chown www-data:www-data -R /var/www # expose only nginx HTTP port EXPOSE 80 +# complete path to ttrss +ENV SELF_URL_PATH http://localhost + # expose default database credentials via ENV in order to ease overwriting ENV DB_NAME ttrss ENV DB_USER ttrss diff --git a/README.md b/README.md index afbde3a..ead7efa 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,15 @@ following additional arguments: -e DB_ENV_PASS=docker ``` +### SELF_URL_PATH + +The `SELF_URL_PATH` config value can be set on runtime. This will enable PUSH +and make the browser integration work. Default value: `http://localhost`. + +``` +-e SELF_URL_PATH=https://example.org/ttrss +``` + ### Testing ttrss in foreground For testing purposes it's recommended to initially start this container in foreground. diff --git a/configure-db.php b/configure-db.php index 6025e30..8f9b1e3 100644 --- a/configure-db.php +++ b/configure-db.php @@ -5,6 +5,9 @@ $confpath = '/var/www/config.php'; $config = array(); +// path to ttrss +$config['SELF_URL_PATH'] = env('SELF_URL_PATH', 'http://localhost'); + if (getenv('DB_TYPE') !== false) { $config['DB_TYPE'] = getenv('DB_TYPE'); } elseif (getenv('DB_PORT_5432_TCP_ADDR') !== false) {