From f222b44edb1d68bd47ac782c67c82bee46d2584c Mon Sep 17 00:00:00 2001 From: Atridad Lahutton <88056492+atridadl@users.noreply.github.com> Date: Thu, 5 May 2022 22:35:01 -0600 Subject: [PATCH] Added support for the livechat plugin --- CHANGELOG | 3 +++ CloudronManifest.json | 2 +- Dockerfile | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c7c671e..6d67bd2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -147,3 +147,6 @@ [2.6.2] * Patch CLI tool - see #4858 + +[2.6.3] +* Add prosody for livechat-plugin diff --git a/CloudronManifest.json b/CloudronManifest.json index f32c310..194acea 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -1,5 +1,5 @@ { - "version": "2.6.2", + "version": "2.6.3", "upstreamVersion": "4.1.1", "id": "org.joinpeertube.cloudronapp", "title": "PeerTube", diff --git a/Dockerfile b/Dockerfile index 434611e..909abbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,11 @@ WORKDIR /app/code/server # we require ffmpeg 4.4.1 - https://github.com/Chocobozzz/PeerTube/releases/tag/v4.0.0 # https://lindevs.com/install-ffmpeg-on-ubuntu/ +RUN echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/prosody.list +RUN sudo wget https://prosody.im/files/prosody-debian-packages.key -O/etc/apt/trusted.gpg.d/prosody.gpg +RUN sudo apt update RUN add-apt-repository -y ppa:savoury1/ffmpeg4 && \ - apt install -y ffmpeg + apt install -y ffmpeg prosody ARG VERSION=4.1.1