Merge a90b2f580e into 3adaf30839

Runs update.sh
feature: add ffmpeg
2025-04-20 02:46:10 +02:00 · 2025-03-27 09:12:07 +01:00 · 2025-03-25 00:35:32 +00:00 · 2025-02-18 19:23:58 +00:00
11 changed files with 17 additions and 9 deletions
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -9,6 +9,7 @@ RUN set -ex; \
    \
    apt-get update; \
    apt-get install -y --no-install-recommends \
+        ffmpeg \
        busybox-static \
        bzip2 \
        libldap-common \
@ -87,7 +88,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
    \
    apk add --no-cache \
+        ffmpeg \
        imagemagick \
        imagemagick-pdf \
        imagemagick-jpeg \
@ -84,7 +85,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@ -9,6 +9,7 @@ RUN set -ex; \
    \
    apt-get update; \
    apt-get install -y --no-install-recommends \
+        ffmpeg \
        busybox-static \
        bzip2 \
        libldap-common \
@ -87,7 +88,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -9,6 +9,7 @@ RUN set -ex; \
    \
    apt-get update; \
    apt-get install -y --no-install-recommends \
+        ffmpeg \
        busybox-static \
        bzip2 \
        libldap-common \
@ -87,7 +88,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
    \
    apk add --no-cache \
+        ffmpeg \
        imagemagick \
        imagemagick-pdf \
        imagemagick-jpeg \
@ -84,7 +85,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -9,6 +9,7 @@ RUN set -ex; \
    \
    apt-get update; \
    apt-get install -y --no-install-recommends \
+        ffmpeg \
        busybox-static \
        bzip2 \
        libldap-common \
@ -87,7 +88,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@ -84,7 +84,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@ -87,7 +87,7 @@ RUN set -ex; \
    pecl install igbinary-3.2.16; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
-    pecl install redis-6.1.0 \
+    pecl install redis-6.2.0 \
        --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"'; \
    \
    docker-php-ext-enable \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -7,6 +7,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
    \
    apk add --no-cache \
+        ffmpeg \
        imagemagick \
        imagemagick-pdf \
        imagemagick-jpeg \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -8,6 +8,7 @@ RUN set -ex; \
    \
    apt-get update; \
    apt-get install -y --no-install-recommends \
+        ffmpeg \
        busybox-static \
        bzip2 \
        libldap-common \
Author	SHA1	Message	Date
realies	1375c6c13e	Merge `a90b2f580e` into `3adaf30839`	2025-03-27 09:12:07 +01:00
GitHub Workflow	3adaf30839	Runs update.sh	2025-03-25 00:35:32 +00:00
realies	a90b2f580e	feature: add ffmpeg Signed-off-by: realies <5107843+realies@users.noreply.github.com>	2025-02-18 19:23:58 +00:00