Merge branch 'v3-rc1' into 'master'

v1.3.0

See merge request cloudron/peertube-app!1
This commit is contained in:
Johannes Zellner 2021-01-07 10:30:06 +00:00
commit 88d120d3e6
3 changed files with 12 additions and 2 deletions

View file

@ -51,3 +51,5 @@
[1.2.0] [1.2.0]
* Update ffmpeg to 4.3 * Update ffmpeg to 4.3
[1.2.0]
* Update to Peertube v3.0.0 RC1

View file

@ -1,5 +1,5 @@
{ {
"version": "1.2.0", "version": "2.0.0",
"id": "org.joinpeertube.cloudronapp", "id": "org.joinpeertube.cloudronapp",
"title": "PeerTube", "title": "PeerTube",
"author": "PeerTube developers", "author": "PeerTube developers",
@ -10,6 +10,14 @@
"icon": "file://logo.png", "icon": "file://logo.png",
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 9000, "httpPort": 9000,
"tcpPorts": {
"RTMP_PORT": {
"title": "RTMP Port",
"description": "RTMP Port for livestreaming",
"defaultValue": 1935,
"containerPort": 1935
}
},
"addons": { "addons": {
"localstorage": {}, "localstorage": {},
"postgresql": {}, "postgresql": {},

View file

@ -14,7 +14,7 @@ RUN apt-get -y update && \
RUN curl -sL https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64 -o /usr/bin/yq && \ RUN curl -sL https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64 -o /usr/bin/yq && \
chmod +x /usr/bin/yq chmod +x /usr/bin/yq
ARG VERSION=2.4.0 ARG VERSION=3.0.0
# install peertube. the chown is required for some reason for ffmpeg. it fails with EROFS without it when transcoding # install peertube. the chown is required for some reason for ffmpeg. it fails with EROFS without it when transcoding
# the transcoding patch is at https://github.com/Chocobozzz/PeerTube/pull/3198 # the transcoding patch is at https://github.com/Chocobozzz/PeerTube/pull/3198