extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2025-02-16 09:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

KASM-5458 Use local, static build of FFMPEG

Browse Source
This commit is contained in:
Mariusz Marciniak 2024-01-23 07:58:36 +00:00
parent 52b6ca1921
commit 3a790f352d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockerfile-kasm-core
View File

@ -93,13 +93,6 @@ RUN bash $INST_SCRIPTS/printer/install_printer.sh && rm -rf $INST_SCRIPTS/printe
COPY ./src/ubuntu/install/printer/resources/*.ppd /etc/cups/ppd/
### Install Recorder Service
RUN apt-get remove -y ffmpeg
RUN wget -q "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz"
RUN tar -xf ffmpeg-release-amd64-static.tar.xz -C .
RUN cp ./ffmpeg-6.1-amd64-static/ffmpeg /usr/local/bin
RUN rm -rf ./ffmpeg-*
COPY ./src/ubuntu/install/recorder $INST_SCRIPTS/recorder/
RUN bash $INST_SCRIPTS/recorder/install_recorder.sh && rm -rf $INST_SCRIPTS/recorder

4
src/ubuntu/install/recorder/install_recorder.sh
View File

@ -12,8 +12,8 @@ elif [ "${DISTRO}" == "opensuse" ]; then
zypper install -ny xhost
fi
COMMIT_ID="3bfd31d0a88c4d74ace9d7c7d12a95bc7f8ce7b7"
BRANCH="feature_KASM-5446-refactor-kasm-recorder-service-to-attempt-to-eliminate-deadlocks-and-corrupt-videos"
COMMIT_ID="85891331d5c6942b1471055803f3af25d722c699"
BRANCH="feature_KASM-5458-fix-ffmpeg-video-corruption-when-container-is-killed"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')