Merge branch 'master' into 'master'

Added support for the livechat plugin

See merge request cloudron/peertube-app!2
This commit is contained in:
Girish Ramakrishnan 2022-05-06 17:53:28 +00:00
commit 5eda83a948
3 changed files with 8 additions and 2 deletions

View file

@ -147,3 +147,6 @@
[2.6.2] [2.6.2]
* Patch CLI tool - see #4858 * Patch CLI tool - see #4858
[2.6.3]
* Add prosody for livechat-plugin

View file

@ -1,5 +1,5 @@
{ {
"version": "2.6.2", "version": "2.6.3",
"upstreamVersion": "4.1.1", "upstreamVersion": "4.1.1",
"id": "org.joinpeertube.cloudronapp", "id": "org.joinpeertube.cloudronapp",
"title": "PeerTube", "title": "PeerTube",

View file

@ -5,8 +5,11 @@ WORKDIR /app/code/server
# we require ffmpeg 4.4.1 - https://github.com/Chocobozzz/PeerTube/releases/tag/v4.0.0 # we require ffmpeg 4.4.1 - https://github.com/Chocobozzz/PeerTube/releases/tag/v4.0.0
# https://lindevs.com/install-ffmpeg-on-ubuntu/ # 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 && \ RUN add-apt-repository -y ppa:savoury1/ffmpeg4 && \
apt install -y ffmpeg apt install -y ffmpeg prosody
ARG VERSION=4.1.1 ARG VERSION=4.1.1