From f97ae774348874e2569ce2dca5c47b21b0139906 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 14 Dec 2021 11:00:22 +0100 Subject: [PATCH] Update to peertube v4 --- CHANGELOG | 5 +++++ CloudronManifest.json | 2 +- DESCRIPTION.md | 2 +- Dockerfile | 8 +++++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a5f3854..e877042 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -117,3 +117,8 @@ * Correctly handle OEmbed with an URL containing query parameters * More robust youtube-dl thumbnail import * Don't send a new video notification when using create transcoding CLI script + +[2.5.0] +* Update PeerTube to 4.0.0 +* [Full changelog](https://github.com/Chocobozzz/PeerTube/releases/tag/v4.0.0) + diff --git a/CloudronManifest.json b/CloudronManifest.json index b4391b5..b621e5c 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -1,5 +1,5 @@ { - "version": "2.4.1", + "version": "2.5.0", "id": "org.joinpeertube.cloudronapp", "title": "PeerTube", "author": "PeerTube developers", diff --git a/DESCRIPTION.md b/DESCRIPTION.md index 44a1019..6ecbb9a 100644 --- a/DESCRIPTION.md +++ b/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages PeerTube 3.4.1 +This app packages PeerTube 4.0.0 ## About diff --git a/Dockerfile b/Dockerfile index 6285100..f782510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,16 @@ FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3f RUN mkdir -p /app/code/server /app/pkg WORKDIR /app/code/server -ARG VERSION=3.4.1 +ARG NODE_VERSION=16.13.1 + +RUN mkdir -p /usr/local/node-${NODE_VERSION} && \ + curl -L https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | tar zxf - --strip-components 1 -C /usr/local/node-${NODE_VERSION} +ENV PATH /usr/local/node-${NODE_VERSION}/bin:$PATH # note: node 10 does not work. ffmpeg 4.4 does not work - https://github.com/Chocobozzz/PeerTube/releases/tag/v3.2.0 (https://github.com/Chocobozzz/PeerTube/issues/3990) +ARG VERSION=4.0.0 + # 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 RUN curl -sL https://github.com/Chocobozzz/PeerTube/releases/download/v${VERSION}/peertube-v${VERSION}.tar.xz | tar --strip-components 1 -Jxvf - && \