diff --git a/CHANGELOG b/CHANGELOG index 2819999..893c30f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -68,3 +68,6 @@ * Log RTMP server error (address already in use) * Fix NPM theme links in admin theme page * Don't reject AP actors with empty description + +[2.0.2] +* Update base image to v3 diff --git a/CloudronManifest.json b/CloudronManifest.json index 4a5941c..4702a53 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -1,5 +1,5 @@ { - "version": "2.0.1", + "version": "2.0.2", "id": "org.joinpeertube.cloudronapp", "title": "PeerTube", "author": "PeerTube developers", diff --git a/Dockerfile b/Dockerfile index 806636a..0e3888f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,14 @@ -FROM cloudron/base:2.0.0@sha256:f9fea80513aa7c92fe2e7bf3978b54c8ac5222f47a9a32a7f8833edf0eb5a4f4 +FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92 RUN mkdir -p /app/code/server /app/pkg WORKDIR /app/code/server -# ffmpeg >= 4.1 is required (https://github.com/Chocobozzz/PeerTube/issues/2469) -RUN apt-get -y update && \ - add-apt-repository ppa:jonathonf/ffmpeg-4 && \ - apt-get update && \ - apt -y install ffmpeg x264 x265 && \ - rm -rf /var/cache/apt /var/lib/apt/lists +ARG NODE_VERSION=12.21.0 -# install 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 +# Expected node version ">=10.x <13" +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 ARG VERSION=3.0.1