From 159a969272c97a6d7576439160e8abaa92f73694 Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:48:38 +0000 Subject: [PATCH 1/6] Update 'README.md' --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2f54cdc..7915e75 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ restart. You don't need to modify ``config.php`` manually for this. accessible on the net, without using a reverse proxy sharing same host, you will need to remove ``127.0.0.1:`` from ``HTTP_PORT`` variable in ``.env``. +* Please don't rename the services inside `docker-compose.yml` unless you know what you're doing. Web container expects application container to be named `app`, if you rename it and it's not accessible via Docker DNS as `http://app` you will run into 502 errors on startup. + #### Build and start the container ```sh From fa0ee188f595a932821750ef7ccd46d05817698f Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:49:02 +0000 Subject: [PATCH 2/6] Update 'README.md' --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7915e75..69adf3a 100644 --- a/README.md +++ b/README.md @@ -29,18 +29,18 @@ git clone https://git.tt-rss.org/fox/ttrss-docker-compose.git ttrss-docker && cd Copy ``.env-dist`` to ``.env`` and edit any relevant variables you need changed. -* You will likely have to change ``SELF_URL_PATH`` which should equal fully qualified tt-rss +You will likely have to change ``SELF_URL_PATH`` which should equal fully qualified tt-rss URL as seen when opening it in your web browser. If this field is set incorrectly, you will likely see the correct value in the tt-rss fatal error message. Note: ``SELF_URL_PATH`` is updated in generated tt-rss ``config.php`` automatically on container restart. You don't need to modify ``config.php`` manually for this. -* By default, container binds to **localhost** port **8280**. If you want the container to be +By default, container binds to **localhost** port **8280**. If you want the container to be accessible on the net, without using a reverse proxy sharing same host, you will need to remove ``127.0.0.1:`` from ``HTTP_PORT`` variable in ``.env``. -* Please don't rename the services inside `docker-compose.yml` unless you know what you're doing. Web container expects application container to be named `app`, if you rename it and it's not accessible via Docker DNS as `http://app` you will run into 502 errors on startup. +Please don't rename the services inside `docker-compose.yml` unless you know what you're doing. Web container expects application container to be named `app`, if you rename it and it's not accessible via Docker DNS as `http://app` you will run into 502 errors on startup. #### Build and start the container From ce2db57fb370198c60f9ed9b3527046d88c88197 Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:49:19 +0000 Subject: [PATCH 3/6] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69adf3a..9335fe5 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ likely see the correct value in the tt-rss fatal error message. Note: ``SELF_URL_PATH`` is updated in generated tt-rss ``config.php`` automatically on container restart. You don't need to modify ``config.php`` manually for this. -By default, container binds to **localhost** port **8280**. If you want the container to be +By default, `web` container binds to **localhost** port **8280**. If you want the container to be accessible on the net, without using a reverse proxy sharing same host, you will need to remove ``127.0.0.1:`` from ``HTTP_PORT`` variable in ``.env``. From c42c514ed1e55add1d65cf96c2abc7f488a8219e Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:54:33 +0000 Subject: [PATCH 4/6] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9335fe5..3ee0c88 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Please don't rename the services inside `docker-compose.yml` unless you know wha #### Build and start the container ```sh -docker-compose up --build +docker-compose up --build -d ``` See docker-compose documentation for more information and available options. From c447753a50dcc6f6bb1c56b923825e89a8d2bd12 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 31 Dec 2020 12:56:20 +0300 Subject: [PATCH 5/6] switch default web container to nginx instead of (unmaintained) caddy v1 --- docker-compose.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b1cd267..2668fb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,15 +72,15 @@ services: - app command: /updater.sh - web: - build: ./web - restart: unless-stopped - ports: - - ${HTTP_PORT}:2015 - volumes: - - app:/var/www/html:ro - depends_on: - - app +# web: +# build: ./web +# restart: unless-stopped +# ports: +# - ${HTTP_PORT}:2015 +# volumes: +# - app:/var/www/html:ro +# depends_on: +# - app # web-ssl: # build: ./web-ssl @@ -97,15 +97,15 @@ services: # depends_on: # - app -# web-nginx: -# build: ./web-nginx -# restart: unless-stopped -# ports: -# - ${HTTP_PORT}:80 -# volumes: -# - app:/var/www/html:ro -# depends_on: -# - app + web-nginx: + build: ./web-nginx + restart: unless-stopped + ports: + - ${HTTP_PORT}:80 + volumes: + - app:/var/www/html:ro + depends_on: + - app volumes: db: From 9742ce638c51a8ed15090627eb13cf7608dabfad Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 10:05:03 +0000 Subject: [PATCH 6/6] Update 'README.md' --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ee0c88..3339384 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ The idea is to provide tt-rss working (and updating) out of the box with minimal General outline of the configuration is as follows: - - separate containers (frontend: caddy, database: pgsql, app and updater: php/fpm) + - separate containers (frontend: nginx, database: pgsql, app and updater: php/fpm) - tt-rss updates from git master repository on container restart - tt-rss source code is stored on a persistent volume so plugins, etc. could be easily added - ``config.php`` is generated if it is missing - database schema is installed automatically if it is missing - - Caddy has its http port exposed to the outside + - nginx has its http port exposed to the outside - optional SSL support via Caddy w/ automatic letsencrypt certificates - feed updates are handled via update daemon started in a separate container (updater) - optional backups container which performs tt-rss database backup once a week