From c036e981013cc5e191503b257c978f26755643ba Mon Sep 17 00:00:00 2001 From: Alix von Schirp Date: Thu, 19 Feb 2026 13:43:42 +0100 Subject: [PATCH] fix: permission issues from 465d4ec3 Signed-off-by: Alix von Schirp --- Dockerfile | 8 +++----- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71393da..76e9cf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG FFMPEG_VERSION=8.0.1 ARG X264_COMMIT=b35605a ARG LAME_VERSION=3.100 -ARG PREFIX=/opt/ffmpeg +ARG PREFIX=/tmp/ffmpeg-build ARG MAKEFLAGS="-j4" RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc @@ -16,8 +16,6 @@ RUN apt-get install -y libclang-rt-20-dev-wasm32 libclang-rt-20-dev-wasm64 libc+ RUN apt-get update && apt-get install -y autoconf libtool build-essential pkgconf -FROM build AS userbuild - USER ${BUILD_USER} # libx264 @@ -106,8 +104,8 @@ RUN emmake make -j4 && \ emmake make install -COPY ./src/ffprobe-wasm-wrapper.cpp /build/src/ffprobe-wasm-wrapper.cpp -COPY ./Makefile /build/Makefile +COPY --chown=${BUILD_USER}:${BUILD_USER} ./src/ffprobe-wasm-wrapper.cpp /build/src/ffprobe-wasm-wrapper.cpp +COPY --chown=${BUILD_USER}:${BUILD_USER} ./Makefile /build/Makefile WORKDIR /build diff --git a/Makefile b/Makefile index e9e2d35..16b0b49 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ dist/ffprobe-wasm.js: mkdir -p dist && \ emcc --bind \ -O3 \ - -L/opt/ffmpeg/lib \ - -I/opt/ffmpeg/include/ \ + -L/tmp/ffmpeg-build/lib \ + -I/tmp/ffmpeg-build/include/ \ -s EXPORTED_RUNTIME_METHODS="[FS, cwrap, ccall, getValue, setValue, writeAsciiToMemory]" \ -s INITIAL_MEMORY=268435456 \ -lavcodec -lavformat -lavfilter -lavdevice -lswresample -lswscale -lavutil -lm -lx264 \