From 68f974859d33207d2311c3a595e00e6b1959cbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 19 Apr 2022 13:40:58 +0200
Subject: [PATCH] release: stable-7210

* 1afa278 prosody: add temporary workaround for JWT auth
* 6fe240a prosody: update to 0.12
* 097558b ci: dry run Docker builds on PRs
* eca5d16 web: fix matching etherpad location
* 3afc1e3 prosody: update package version
* b0617c0 web: fix Etherpad when using multi-domain
* 0ce0f09 prosody: update version
* 201a1b4 prosody: pin to version 0.11 for now
* 29b4c23 prosody: use a more recent version of luarocks
* c5b049a jvb: forward port 8080 to docker host
* 6af7cd8 doc: update CHANGELOG
* dd7b70b misc: working on latest
---
 CHANGELOG.md       | 17 +++++++++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0f265f849..ee50cd882a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## stable-7210
+
+Based on stable release 7210.
+
+* 1afa278 prosody: add temporary workaround for JWT auth
+* 6fe240a prosody: update to 0.12
+* 097558b ci: dry run Docker builds on PRs
+* eca5d16 web: fix matching etherpad location
+* 3afc1e3 prosody: update package version
+* b0617c0 web: fix Etherpad when using multi-domain
+* 0ce0f09 prosody: update version
+* 201a1b4 prosody: pin to version 0.11 for now
+* 29b4c23 prosody: use a more recent version of luarocks
+* c5b049a jvb: forward port 8080 to docker host
+* 6af7cd8 doc: update CHANGELOG
+* dd7b70b misc: working on latest
+
 ## stable-7001
 
 **IMPORTANT:** Starting with this release TCP has support has been removed from the JVB.
diff --git a/docker-compose.yml b/docker-compose.yml
index 07f611917f..82a41e8f1e 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-7210
         restart: ${RESTART_POLICY}
         ports:
             - '${HTTP_PORT}:80'
@@ -131,7 +131,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:latest
+        image: jitsi/prosody:stable-7210
         restart: ${RESTART_POLICY}
         expose:
             - '5222'
@@ -211,7 +211,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:latest
+        image: jitsi/jicofo:stable-7210
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
@@ -262,7 +262,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:latest
+        image: jitsi/jvb:stable-7210
         restart: ${RESTART_POLICY}
         ports:
             - '${JVB_PORT}:${JVB_PORT}/udp'
diff --git a/jibri.yml b/jibri.yml
index be29ab81ef..0502996d30 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:latest
+        image: jitsi/jibri:stable-7210
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 2b5d9a88ce..1e864ce500 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-7210
         restart: ${RESTART_POLICY}
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'