diff --git a/services/playout/Dockerfile b/services/playout/Dockerfile index d02e3c2..362a088 100644 --- a/services/playout/Dockerfile +++ b/services/playout/Dockerfile @@ -4,9 +4,8 @@ # from URLs supplied as build args; the build still succeeds without them. # CasparCG 2.4.0 ubuntu22 zip — last release with a generic x86-64 tarball. -# 2.4.1+ and 2.5.x ship as .deb compiled with AVX2 (noble/jammy baseline), -# which illegal-instruction-crash on Sandy Bridge / Ivy Bridge (AVX only, no AVX2). -# The 2.4.0 ubuntu22 zip targets Ubuntu 22 and runs on older Xeon E5 hardware. +# 2.4.1+ and 2.5.x ship as .deb compiled with AVX2 which crash on Sandy Bridge +# (AVX only, no AVX2). The ubuntu22 zip ships its own bundled libs under lib/. FROM ubuntu:22.04 ARG CASPAR_VERSION=2.4.0-stable @@ -16,10 +15,8 @@ ARG NDI_SDK_URL= ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates curl unzip tar xz-utils \ + ca-certificates curl unzip tar xz-utils gnupg \ xvfb libgl1-mesa-dri libglu1-mesa fonts-dejavu-core \ - libavcodec58 libavformat58 libavfilter7 libswscale5 libswresample3 \ - libopenal1 libsndfile1 gnupg \ && mkdir -p /etc/apt/keyrings \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \ | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ @@ -28,18 +25,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get update && apt-get install -y --no-install-recommends nodejs \ && rm -rf /var/lib/apt/lists/* +# Zip layout: casparcg_server/{bin/casparcg, lib/*.so, casparcg.config, ...} +# Binary is bin/casparcg; lib/ has bundled .so files. WORKDIR /tmp/caspar RUN set -eux; \ curl -fsSL "$CASPAR_URL" -o caspar.zip; \ - unzip caspar.zip -d /opt; \ - CASPAR_DIR=$(find /opt -maxdepth 2 \( -name 'casparcg' -o -name 'CasparCG Server' \) -type f -perm /111 2>/dev/null | head -1 | xargs dirname 2>/dev/null); \ - [ -n "$CASPAR_DIR" ] || CASPAR_DIR=$(find /opt -maxdepth 1 -type d | grep -i caspar | head -1); \ - echo "caspar dir: $CASPAR_DIR"; \ - ln -sfn "$CASPAR_DIR" /opt/casparcg; \ - BIN=$(find /opt/casparcg -maxdepth 1 \( -name 'casparcg' -o -name 'CasparCG Server' \) -perm /111 | head -1); \ - echo "caspar binary: $BIN"; \ - test -n "$BIN"; \ - ln -sfn "$BIN" /usr/local/bin/casparcg; \ + python3 -c "import zipfile,sys; zipfile.ZipFile('caspar.zip').extractall('/opt')"; \ + ls /opt/casparcg_server/; \ + test -x /opt/casparcg_server/bin/casparcg; \ + ln -sfn /opt/casparcg_server /opt/casparcg; \ + echo "caspar binary: /opt/casparcg_server/bin/casparcg"; \ cd /; rm -rf /tmp/caspar RUN if [ -n "$NDI_SDK_URL" ]; then \