LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

bring aarch64 in line, revert local test makeflag

Browse Source
This commit is contained in:
aptalca 2023-06-11 21:57:03 -04:00
parent 0065ff3229
commit 553d8b6757
No known key found for this signature in database
GPG Key ID: BE36CFFB9FD85548
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -8,7 +8,7 @@ ARG FFMPEG_VERSION
# common env
ENV \
DEBIAN_FRONTEND="noninteractive" \
MAKEFLAGS="-j8"
MAKEFLAGS="-j4"
# versions
ENV \

11
Dockerfile.aarch64
View File

@ -420,17 +420,18 @@ RUN \
RUN \
echo "**** arrange files ****" && \
ldconfig && \
mkdir -p /buildout/usr/local/bin && \
mkdir -p \
/buildout/usr/local/bin \
/buildout/usr/local/lib && \
cp \
/tmp/ffmpeg/ffmpeg \
/buildout/usr/local/bin && \
cp \
/tmp/ffmpeg/ffprobe \
/buildout/usr/local/bin && \
mkdir -p /buildout/usr/lib && \
ldd /tmp/ffmpeg/ffmpeg \
| awk '/local/ {print $3}' \
| xargs -i cp -L {} /buildout/usr/lib/
cp -a \
/usr/local/lib/lib* \
/buildout/usr/local/lib/
# Storage layer consumed downstream
FROM scratch