From 20e2f7f831cb1fb7420901ec18641ae31193bb43 Mon Sep 17 00:00:00 2001 From: Oleksandr Venger Date: Fri, 10 Nov 2023 21:25:59 -0800 Subject: [PATCH 1/2] Fix FFMPEG Configure in docker --- docker/local/Dockerfile-php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/local/Dockerfile-php b/docker/local/Dockerfile-php index 47c0fd43ff..c9ea3735ed 100644 --- a/docker/local/Dockerfile-php +++ b/docker/local/Dockerfile-php @@ -1,4 +1,4 @@ -FROM alpine:3.13 as build +FROM alpine:3.18 as build ARG FFMPEG_VERSION=4.3.2 ARG PREFIX=/opt/ffmpeg @@ -104,11 +104,13 @@ RUN apk add --no-cache supervisor beanstalkd zip libzip python3 libtheora rtmpdu && rm -rf /var/cache/apk/* COPY --from=build /opt/ffmpeg /opt/ffmpeg +COPY --from=build /usr/lib/libssl.so.3 /usr/lib/libssl.so.3 +COPY --from=build /usr/lib/libcrypto.so.3 /usr/lib/libcrypto.so.3 COPY --from=build /usr/lib/libfdk-aac.so.2 /usr/lib/libfdk-aac.so.2 COPY --from=build /usr/lib/librav1e.so.0 /usr/lib/librav1e.so.0 -COPY --from=build /usr/lib/libx264.so.157 /usr/lib/libx264.so.157 -COPY --from=build /usr/lib/libvpx.so.6 /usr/lib/libvpx.so.6 -COPY --from=build /usr/lib/libx265.so.192 /usr/lib/libx265.so.192 +COPY --from=build /usr/lib/libx264.so.164 /usr/lib/libx264.so.164 +COPY --from=build /usr/lib/libvpx.so.8 /usr/lib/libvpx.so.8 +COPY --from=build /usr/lib/libx265.so.199 /usr/lib/libx265.so.199 COPY docker/local/server/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf COPY docker/local/server/config/php.ini /usr/local/etc/php/ From b068b6b081ee088334dae5b6e5c2cbfc35090b5c Mon Sep 17 00:00:00 2001 From: Oleksandr Venger Date: Mon, 27 Nov 2023 12:01:19 -0800 Subject: [PATCH 2/2] Update lib copy with wildcard --- docker/local/Dockerfile-php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/local/Dockerfile-php b/docker/local/Dockerfile-php index c9ea3735ed..7873a97601 100644 --- a/docker/local/Dockerfile-php +++ b/docker/local/Dockerfile-php @@ -104,13 +104,13 @@ RUN apk add --no-cache supervisor beanstalkd zip libzip python3 libtheora rtmpdu && rm -rf /var/cache/apk/* COPY --from=build /opt/ffmpeg /opt/ffmpeg -COPY --from=build /usr/lib/libssl.so.3 /usr/lib/libssl.so.3 -COPY --from=build /usr/lib/libcrypto.so.3 /usr/lib/libcrypto.so.3 -COPY --from=build /usr/lib/libfdk-aac.so.2 /usr/lib/libfdk-aac.so.2 -COPY --from=build /usr/lib/librav1e.so.0 /usr/lib/librav1e.so.0 -COPY --from=build /usr/lib/libx264.so.164 /usr/lib/libx264.so.164 -COPY --from=build /usr/lib/libvpx.so.8 /usr/lib/libvpx.so.8 -COPY --from=build /usr/lib/libx265.so.199 /usr/lib/libx265.so.199 +COPY --from=build /usr/lib/libssl.so* /usr/lib/ +COPY --from=build /usr/lib/libcrypto.so* /usr/lib/ +COPY --from=build /usr/lib/libfdk-aac.so* /usr/lib/ +COPY --from=build /usr/lib/librav1e.so* /usr/lib/ +COPY --from=build /usr/lib/libx264.so* /usr/lib/ +COPY --from=build /usr/lib/libvpx.so* /usr/lib/ +COPY --from=build /usr/lib/libx265.so* /usr/lib/ COPY docker/local/server/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf COPY docker/local/server/config/php.ini /usr/local/etc/php/