From 70fdb9bdf6dada5f5b370179d3da6a15d0b0b1bf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 11 Oct 2020 09:09:48 +0300 Subject: [PATCH 1/5] do not create backup config.php when rewriting SELF_URL_PATH --- src/app/startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/startup.sh b/src/app/startup.sh index 68a7cae..be81a84 100755 --- a/src/app/startup.sh +++ b/src/app/startup.sh @@ -80,7 +80,7 @@ EOF else sed \ -e "s/define('SELF_URL_PATH'.*/define('SELF_URL_PATH','$SELF_URL_PATH');/" \ - -i.bak $DST_DIR/config.php + -i $DST_DIR/config.php fi touch $DST_DIR/.app_is_ready From c5bcab0f4a3c22736cf2a3b306526a677028e870 Mon Sep 17 00:00:00 2001 From: fox Date: Sun, 22 Nov 2020 18:32:21 +0000 Subject: [PATCH 2/5] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13260ad..1da41ca 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ If database needs to be updated, tt-rss will prompt you to do so on next page re #### Updating container scripts 1. Stop the containers: ``docker-compose down && docker-compose rm`` -2. Update scripts from git: ``git pull origin master`` and apply any necessary modifications to ``.env``, etc. +2. Update scripts from git: ``git pull origin static-dockerhub`` and apply any necessary modifications to ``.env``, etc. 3. Pull fresh images and start the containers: ``docker-compose pull && docker-compose up`` ### Suggestions / bug reports From d54b82a7511ddfb3b42ee2e29883142f56a5cd54 Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 05:36:35 +0000 Subject: [PATCH 3/5] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1da41ca..ebace1d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The idea is to provide tt-rss working (and updating) out of the box with minimal fuss. -**This compose setup uses prebuilt images from Docker Hub.** +**This setup uses official prebuilt images from Docker Hub. Note that images are only available for Linux/amd64.** - [TODO](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki/TODO) - [FAQ](https://git.tt-rss.org/fox/ttrss-docker-compose/wiki#faq) From 96aa5d23c66d1838d61fd9cd09fd71899dd22736 Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:50:16 +0000 Subject: [PATCH 4/5] Update 'README.md' --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ebace1d..a654308 100644 --- a/README.md +++ b/README.md @@ -39,17 +39,19 @@ want to build your own containers. 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, `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``. +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. + #### Pull and start the container ```sh From 40e76d8da1c5e1d2d2031b52501efc2d376e05b1 Mon Sep 17 00:00:00 2001 From: fox Date: Thu, 31 Dec 2020 08:54:21 +0000 Subject: [PATCH 5/5] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a654308..b15b077 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Please don't rename the services inside `docker-compose.yml` unless you know wha #### Pull and start the container ```sh -docker-compose pull && docker-compose up +docker-compose pull && docker-compose up -d ``` See ``docker-compose`` documentation for more information and available options.