remove patches

This commit is contained in:
Girish Ramakrishnan 2022-06-07 12:47:24 -07:00
parent 5b6c702868
commit 6cb09b4425

View file

@ -13,16 +13,12 @@ RUN apt update && \
ARG VERSION=4.2.0 ARG VERSION=4.2.0
# install peertube. the chown is required for some reason for ffmpeg. it fails with EROFS without it when transcoding # 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 - && \ 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 && \ 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
# CLI patch for https://github.com/Chocobozzz/PeerTube/issues/4858
RUN mkdir /app/code/cli && \ 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 && \ 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 && \ 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 && \ NOCLIENT=1 yarn install --pure-lockfile && \
npm run setup:cli npm run setup:cli