From 721dbfdc1ca260e0888185fdab3f1e7d872e74eb Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 2 Jun 2021 21:08:06 -0700
Subject: [PATCH] Version 2.2.0

---
 CHANGELOG             | 6 ++++++
 CloudronManifest.json | 2 +-
 DESCRIPTION.md        | 2 +-
 Dockerfile            | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c6f40a0..c965918 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -86,3 +86,9 @@
 * Support webp avatar upload
 * Allow user to search through their watch history #3576
 * Allow AP resolution for default account/channel pages (/accounts/:name/video-channels and /video-channels/:name/videos)
+
+[2.2.0]
+* Update Peertube to 3.2.1
+* [Full changelog](https://github.com/Chocobozzz/PeerTube/releases/tag/v3.2.0)
+* By default, HLS transcoding is now enabled and webtorrent is disabled. We suggest you to reflect this change.
+* PeerTube client now displays bigger video thumbnails.
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 6ec30de..96f5965 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.0",
+  "version": "2.2.0",
   "id": "org.joinpeertube.cloudronapp",
   "title": "PeerTube",
   "author": "PeerTube developers",
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index b50d706..b0382a5 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages PeerTube <upstream>3.1.0</upstream>
+This app packages PeerTube <upstream>3.2.1</upstream>
 
 ## About
 
diff --git a/Dockerfile b/Dockerfile
index 8804199..703c102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,8 @@ WORKDIR /app/code/server
 
 ARG VERSION=3.2.1
 
+# note: node 10 does not work. ffmpeg 4.4 does not work - https://github.com/Chocobozzz/PeerTube/releases/tag/v3.2.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 - && \