Bump version for base image v3

This commit is contained in:
Johannes Zellner 2021-02-24 14:17:20 +01:00
parent 6f8f785c5a
commit 0cf679634e
3 changed files with 10 additions and 11 deletions

View file

@ -68,3 +68,6 @@
* Log RTMP server error (address already in use) * Log RTMP server error (address already in use)
* Fix NPM theme links in admin theme page * Fix NPM theme links in admin theme page
* Don't reject AP actors with empty description * Don't reject AP actors with empty description
[2.0.2]
* Update base image to v3

View file

@ -1,5 +1,5 @@
{ {
"version": "2.0.1", "version": "2.0.2",
"id": "org.joinpeertube.cloudronapp", "id": "org.joinpeertube.cloudronapp",
"title": "PeerTube", "title": "PeerTube",
"author": "PeerTube developers", "author": "PeerTube developers",

View file

@ -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 RUN mkdir -p /app/code/server /app/pkg
WORKDIR /app/code/server WORKDIR /app/code/server
# ffmpeg >= 4.1 is required (https://github.com/Chocobozzz/PeerTube/issues/2469) ARG NODE_VERSION=12.21.0
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
# install yq # Expected node version ">=10.x <13"
RUN curl -sL https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64 -o /usr/bin/yq && \ RUN mkdir -p /usr/local/node-${NODE_VERSION} && \
chmod +x /usr/bin/yq 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 ARG VERSION=3.0.1