Merge pull request #2633 from FreshRSS/dev1.15.1

FreshRSS 1.15.1

1 files changed, 4 insertions, 3 deletions

diff --git a/Docker/README.md b/Docker/README.md
index 15510a220..6920471df 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -162,10 +162,11 @@ docker build --pull --tag freshrss/freshrss -f Docker/Dockerfile .
 ## Command line
 
 ```sh
-docker exec --user apache -it freshrss php ./cli/list-users.php
+docker exec --user www-data -it freshrss php ./cli/list-users.php
 ```
 
 See the [CLI documentation](../cli/) for all the other commands.
+You might have to replace `--user www-data` by `--user apache` when using our images based on Linux Alpine.
 
 
 ## Debugging
@@ -210,7 +211,7 @@ Remember not pass the `CRON_MIN` environment variable to your Docker run, to avo
 Example on Debian / Ubuntu: Create `/etc/cron.d/FreshRSS` with:
 
 ```
-7,37 * * * * root docker exec --user apache -it freshrss php ./app/actualize_script.php > /tmp/FreshRSS.log 2>&1
+7,37 * * * * root docker exec --user www-data -it freshrss php ./app/actualize_script.php > /tmp/FreshRSS.log 2>&1
 ```
 
 ### Option 3) Cron as another instance of the same FreshRSS Docker image
@@ -320,7 +321,7 @@ server {
 	# Other SSL stuff goes here
 
 	# Needed for Freshrss cookie/session :
-	proxy_cookie_path / "/; HTTPOnly; Secure";
+	proxy_cookie_path / "/; HTTPOnly; Secure; SameSite=Lax";
 
 	location / {
 		try_files $uri $uri/ =404;