From 6cb09b44250f69f05664e7ebc30303a6f5ecbabd Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 7 Jun 2022 12:47:24 -0700 Subject: [PATCH] remove patches --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6939814..f3b4b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,16 +13,12 @@ RUN apt update && \ ARG VERSION=4.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 - && \ - yarn install --production --pure-lockfile && \ - sed -e 's/niceness: constants_1.FFMPEG_NICE.TRANSCODING/niceness: constants_1.FFMPEG_NICE.TRANSCODING, cwd: config_1.CONFIG.STORAGE.TMP_DIR/' -i /app/code/server/dist/server/helpers/ffmpeg-utils.js + yarn install --production --pure-lockfile -# CLI patch for https://github.com/Chocobozzz/PeerTube/issues/4858 RUN mkdir /app/code/cli && \ curl -L https://github.com/Chocobozzz/PeerTube/archive/v${VERSION}.tar.gz | tar -zxvf - --strip-components=1 -C /app/code/cli && \ cd /app/code/cli && \ - curl -L https://github.com/Chocobozzz/PeerTube/commit/74220dba9db6a1dc5c0b504b0230de26ef9c9dd5.patch -o /tmp/cli.patch && patch -p1 < /tmp/cli.patch && rm /tmp/cli.patch && \ NOCLIENT=1 yarn install --pure-lockfile && \ npm run setup:cli