From e9ee50eef26b8f21e97e9f5397e3a2a007b6c4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Thu, 7 May 2020 22:41:35 +0200
Subject: [PATCH] release: stable-4548-1

* abf2f73 jicofo: fix setting incorrect auth URL scheme for JWT
* 3472ab0 jicofo: add ability to configure health checks
* ec3622b jibri: install jitsi-upload-integrations by default
* 0e7bc91 etherpad: pin image version
* 4fa50b9 jwt: do not load token_verification module with disabled authentication
* b0d76a2 jibri: add jq dep for upload integrations
* 53b58fd jvb: add jq, curl deps for graceful_shutdown.sh
* 2d063ad doc: update installation instructions
* e73df5f misc: working on latest
---
 CHANGELOG.md       | 14 ++++++++++++++
 docker-compose.yml |  8 ++++----
 etherpad.yml       |  2 +-
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d65e43..3949203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## stable-4548-1
+
+Based on stable release 4548-1.
+
+* abf2f73 jicofo: fix setting incorrect auth URL scheme for JWT
+* 3472ab0 jicofo: add ability to configure health checks
+* ec3622b jibri: install jitsi-upload-integrations by default
+* 0e7bc91 etherpad: pin image version
+* 4fa50b9 jwt: do not load token_verification module with disabled authentication
+* b0d76a2 jibri: add jq dep for upload integrations
+* 53b58fd jvb: add jq, curl deps for graceful_shutdown.sh
+* 2d063ad doc: update installation instructions
+* e73df5f misc: working on latest
+
 ## stable-4548
 
 Based on stable release 4548.
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c9d0f6..d13dbd1 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-4548-1
         restart: ${RESTART_POLICY}
         ports:
             - '${HTTP_PORT}:80'
@@ -45,7 +45,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:latest
+        image: jitsi/prosody:stable-4548-1
         restart: ${RESTART_POLICY}
         expose:
             - '5222'
@@ -110,7 +110,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:latest
+        image: jitsi/jicofo:stable-4548-1
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
@@ -138,7 +138,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:latest
+        image: jitsi/jvb:stable-4548-1
         restart: ${RESTART_POLICY}
         ports:
             - '${JVB_PORT}:${JVB_PORT}/udp'
diff --git a/etherpad.yml b/etherpad.yml
index daf9c1d..5ce6dd6 100644
--- a/etherpad.yml
+++ b/etherpad.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Etherpad: real-time collaborative document editing
     etherpad:
-        image: jitsi/etherpad:latest
+        image: jitsi/etherpad:stable-4548-1
         restart: ${RESTART_POLICY}
         networks:
             meet.jitsi:
diff --git a/jibri.yml b/jibri.yml
index 67b5b98..5c082ee 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:latest
+        image: jitsi/jibri:stable-4548-1
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index b50ab71..099ee13 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-4548-1
         restart: ${RESTART_POLICY}
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'