From 7a1c2f3cc8148b421284dd2b9e3b3e64840eac0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 4 Dec 2020 23:11:22 +0100
Subject: [PATCH] release: stable-5142-2

* 700c04a web: properly handle acme.sh return codes
* 4cb181c web: install acme certs to persistent storage
* 1d2c68a web: fix running acme.sh on the right home directory
* 5c44a84 misc: stop using apt-key, it's deprecated
* 5f06c3a doc: update CHANGELOG
* 0f780b4 misc: working on latest
---
 CHANGELOG.md       | 11 +++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 391d3e446d..01219481d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## stable-5142-2
+
+Based on stable release 5142-2.
+
+* 700c04a web: properly handle acme.sh return codes
+* 4cb181c web: install acme certs to persistent storage
+* 1d2c68a web: fix running acme.sh on the right home directory
+* 5c44a84 misc: stop using apt-key, it's deprecated
+* 5f06c3a doc: update CHANGELOG
+* 0f780b4 misc: working on latest
+
 ## stable-5142-1
 
 **Important:** This release includes 2 major changes: migrating the base image to Debian Buster and replacing certbot with acme.sh for getting Letś Encrypt certificates. Please report any problems you find!
diff --git a/docker-compose.yml b/docker-compose.yml
index 0df3426fb9..87e8835d0b 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-5142-2
         restart: ${RESTART_POLICY}
         ports:
             - '${HTTP_PORT}:80'
@@ -96,7 +96,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:latest
+        image: jitsi/prosody:stable-5142-2
         restart: ${RESTART_POLICY}
         expose:
             - '5222'
@@ -164,7 +164,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:latest
+        image: jitsi/jicofo:stable-5142-2
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
@@ -193,7 +193,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:latest
+        image: jitsi/jvb:stable-5142-2
         restart: ${RESTART_POLICY}
         ports:
             - '${JVB_PORT}:${JVB_PORT}/udp'
diff --git a/jibri.yml b/jibri.yml
index 67b5b9807f..d0fb3a23c0 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:latest
+        image: jitsi/jibri:stable-5142-2
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index b50ab71297..9a7c6c09d7 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-5142-2
         restart: ${RESTART_POLICY}
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'