From 77da42537ec9262db1d66ee689351bc8e5a6ecc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 14 May 2021 15:16:04 +0200
Subject: [PATCH] release: stable-5870

* d9b84cf jibri: set base URL for joining meetings
* a77a43e jibri: update default Chrome version to 90
* a90e4ce doc: drop confusing port number from PUBLIC_URL
* 8620caa doc: clarify env variable
* 6f52f71 web: add FLoC environment variable
* 014aa59 web: add default language variable
* ce25bf6 doc: update CHANGELOG
* 6bf1336 misc: working on latest
---
 CHANGELOG.md       | 13 +++++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ed9eb4..1b85fba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## stable-5870
+
+Based on stable release 5870.
+
+* d9b84cf jibri: set base URL for joining meetings
+* a77a43e jibri: update default Chrome version to 90
+* a90e4ce doc: drop confusing port number from PUBLIC_URL
+* 8620caa doc: clarify env variable
+* 6f52f71 web: add FLoC environment variable
+* 014aa59 web: add default language variable
+* ce25bf6 doc: update CHANGELOG
+* 6bf1336 misc: working on latest
+
 ## stable-5765-1
 
 Based on stable release 5765.
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c229b3..5268815 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Frontend
     web:
-        image: jitsi/web:latest
+        image: jitsi/web:stable-5870
         restart: ${RESTART_POLICY}
         ports:
             - '${HTTP_PORT}:80'
@@ -111,7 +111,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:latest
+        image: jitsi/prosody:stable-5870
         restart: ${RESTART_POLICY}
         expose:
             - '5222'
@@ -180,7 +180,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:latest
+        image: jitsi/jicofo:stable-5870
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
@@ -226,7 +226,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:latest
+        image: jitsi/jvb:stable-5870
         restart: ${RESTART_POLICY}
         ports:
             - '${JVB_PORT}:${JVB_PORT}/udp'
diff --git a/jibri.yml b/jibri.yml
index 1cd0031..fc62624 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:latest
+        image: jitsi/jibri:stable-5870
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index ed7c5b4..913854e 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:latest
+        image: jitsi/jigasi:stable-5870
         restart: ${RESTART_POLICY}
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'