From cd49e9819bea35a4db05e3e76910b739898c2219 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 22 Mar 2020 16:31:20 +0100
Subject: New core-extensions to allow Docker volumes for third-party
 extensions (#2837)

* New core-extensions to allow Docker volumes for third-party extensions

#Fix https://github.com/FreshRSS/FreshRSS/issues/2650
Split our extensions directory into two:
1) Core extensions shipped with FreshRSS in ./lib/core-extensions/
2) Third-party extensions modified by end-users in ./extensions/ which
can easily be mounted as a Docker volume

* Example of Docker Compose with extensions

* Back-compatibility + fix array merge bug
---
 Docker/README.md          | 4 ++++
 Docker/docker-compose.yml | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'Docker')

diff --git a/Docker/README.md b/Docker/README.md
index 6920471df..92f13bcf3 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -56,10 +56,12 @@ You must first chose a domain (DNS) or sub-domain, e.g. `freshrss.example.net`.
 
 ```sh
 docker volume create freshrss-data
+docker volume create freshrss-extensions
 
 # Remember to replace freshrss.example.net by your server address in the command below:
 docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss-data:/var/www/FreshRSS/data \
+  -v freshrss-extensions:/var/www/FreshRSS/extensions \
   -e 'CRON_MIN=4,34' \
   -e TZ=Europe/Paris \
   --net freshrss-network \
@@ -223,6 +225,7 @@ See cron option 1 for customising the cron schedule.
 ```sh
 docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss-data:/var/www/FreshRSS/data \
+  -v freshrss-extensions:/var/www/FreshRSS/extensions \
   -e 'CRON_MIN=17,47' \
   --net freshrss-network \
   --name freshrss_cron freshrss/freshrss \
@@ -233,6 +236,7 @@ docker run -d --restart unless-stopped --log-opt max-size=10m \
 ```sh
 docker run -d --restart unless-stopped --log-opt max-size=10m \
   -v freshrss-data:/var/www/FreshRSS/data \
+  -v freshrss-extensions:/var/www/FreshRSS/extensions \
   -e 'CRON_MIN=27,57' \
   --net freshrss-network \
   --name freshrss_cron freshrss/freshrss:alpine \
diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
index 1c0a79ab8..9b8952329 100644
--- a/Docker/docker-compose.yml
+++ b/Docker/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - freshrss_postgresql
     volumes:
       - freshrss_data:/var/www/FreshRSS/data
+      - freshrss_extensions:/var/www/FreshRSS/extensions
     environment:
       - CRON_MIN=*/20
       - TZ=Europe/Copenhagen
@@ -29,3 +30,4 @@ services:
 volumes:
   pgsql_data:
   freshrss_data:
+  freshrss_extensions:
-- 
cgit v1.2.3