aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-05-20 12:04:12 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-05-20 12:04:12 +0200
commitfd7b0c1e7854b00f222cad96c376ef8a7d547d7d (patch)
tree54822c73247116d6d94e9f9b068343b230c5311b
parent967dc041a7da1f4ed42cd1b32719641bcbea3e0d (diff)
Changelog 1882
https://github.com/FreshRSS/FreshRSS/pull/1882
-rw-r--r--CHANGELOG.md1
-rw-r--r--Docker/README.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 660845ec2..09f389205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
* Example: `Hello intitle:World OR date:P1D example OR author:Else intitle:"This or that"`
* Deployment
* Includes an optional cron daemon in Docker to refresh feeds automatically [#1869](https://github.com/FreshRSS/FreshRSS/issues/1869)
+ * Docker Compose example [#1882](https://github.com/FreshRSS/FreshRSS/pull/1882)
* Bug fixing
* Fix Docker bug affecting Apache `CustomLog` (unwanted local copy of access logs), `ErrorLog`, `Listen` (IPv6 bug) [#1873](https://github.com/FreshRSS/FreshRSS/pull/1873)
* Fix muted feeds that were not actually muted [#1844](https://github.com/FreshRSS/FreshRSS/issues/1844)
diff --git a/Docker/README.md b/Docker/README.md
index c333329d4..381adab38 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -158,7 +158,7 @@ with HTTPS, for instance using [Let’s Encrypt](https://letsencrypt.org/).
### Example with [docker-compose](https://docs.docker.com/compose/)
-A `docker-compose.yml` file is given as an example, using PostgreSQL. In order to use it, you have to adapt:
+A [docker-compose.yml](docker-compose.yml) file is given as an example, using PostgreSQL. In order to use it, you have to adapt:
- In the `postgresql` service:
* the `volumes` section;
* the `POSTGRES_PASSWORD` in the `environment` section;