Merge remote-tracking branch 'github/master'

VSLCatena · Aug 10, 2024 · 9d3e64f · 9d3e64f
2 parents 6b797f9 + a718f49
commit 9d3e64f
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -64,57 +64,57 @@ As in many projects the documentation is kind of up to date 😅.
 
 The following images which are currently supported are based on `php:{VER}-fpm-buster`.
 
-* `webdevops/php:7.4`
 * `webdevops/php:8.0`
 * `webdevops/php:8.1`
 * `webdevops/php:8.2`
-* `webdevops/php-dev:7.4`
+* `webdevops/php:8.3`
 * `webdevops/php-dev:8.0`
 * `webdevops/php-dev:8.1`
 * `webdevops/php-dev:8.2`
-* `webdevops/php-apache:7.4`
+* `webdevops/php-dev:8.3`
 * `webdevops/php-apache:8.0`
 * `webdevops/php-apache:8.1`
 * `webdevops/php-apache:8.2`
-* `webdevops/php-apache-dev:7.4`
+* `webdevops/php-apache:8.3`
 * `webdevops/php-apache-dev:8.0`
 * `webdevops/php-apache-dev:8.1`
 * `webdevops/php-apache-dev:8.2`
-* `webdevops/php-nginx:7.4`
+* `webdevops/php-apache-dev:8.3`
 * `webdevops/php-nginx:8.0`
 * `webdevops/php-nginx:8.1`
 * `webdevops/php-nginx:8.2`
-* `webdevops/php-nginx-dev:7.4`
+* `webdevops/php-nginx:8.3`
 * `webdevops/php-nginx-dev:8.0`
 * `webdevops/php-nginx-dev:8.1`
 * `webdevops/php-nginx-dev:8.2`
+* `webdevops/php-nginx-dev:8.3`
 
 
 ### Alpine PHP
 
 The following images which are currently supported are based on `php:{VER}-fpm-alpine`.
 
-* `webdevops/php:7.4-alpine`
 * `webdevops/php:8.0-alpine`
 * `webdevops/php:8.1-alpine`
 * `webdevops/php:8.2-alpine`
-* `webdevops/php-dev:7.4-alpine`
+* `webdevops/php:8.3-alpine`
 * `webdevops/php-dev:8.0-alpine`
 * `webdevops/php-dev:8.1-alpine`
 * `webdevops/php-dev:8.2-alpine`
-* `webdevops/php-apache:7.4-alpine`
+* `webdevops/php-dev:8.3-alpine`
 * `webdevops/php-apache:8.0-alpine`
 * `webdevops/php-apache:8.1-alpine`
 * `webdevops/php-apache:8.2-alpine`
-* `webdevops/php-apache-dev:7.4-alpine`
+* `webdevops/php-apache:8.3-alpine`
 * `webdevops/php-apache-dev:8.0-alpine`
 * `webdevops/php-apache-dev:8.1-alpine`
 * `webdevops/php-apache-dev:8.2-alpine`
-* `webdevops/php-nginx:7.4-alpine`
+* `webdevops/php-apache-dev:8.3-alpine`
 * `webdevops/php-nginx:8.0-alpine`
 * `webdevops/php-nginx:8.1-alpine`
 * `webdevops/php-nginx:8.2-alpine`
-* `webdevops/php-nginx-dev:7.4-alpine`
+* `webdevops/php-nginx:8.3-alpine`
 * `webdevops/php-nginx-dev:8.0-alpine`
 * `webdevops/php-nginx-dev:8.1-alpine`
 * `webdevops/php-nginx-dev:8.2-alpine`
+* `webdevops/php-nginx-dev:8.3-alpine`
diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile
@@ -191,13 +191,19 @@ RUN set -x \
     && docker-php-ext-install $MEMCACHED \
     && rm -rf $MEMCACHED \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install vips \
     && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install xmlrpc-1.0.0RC3 \
     && docker-php-ext-enable \
         apcu \
+        excimer \
+        opentelemetry \
+        protobuf \
         vips \
         yaml \
         redis \

diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile
@@ -149,6 +149,7 @@ RUN set -x \
         bcmath \
         amqp \
         imagick \
+        ffi \
         bz2 \
         calendar \
         exif \
@@ -177,11 +178,17 @@ RUN set -x \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
+    && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \
+    && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \
+    && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \
     && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \

diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile
@@ -188,13 +188,19 @@ RUN set -x \
     && docker-php-ext-install $MEMCACHED \
     && rm -rf $MEMCACHED \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install vips \
     && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install xmlrpc-1.0.0RC3 \
     && docker-php-ext-enable \
         apcu \
+        excimer \
+        opentelemetry \
+        protobuf \
         vips \
         yaml \
         redis \

diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile
@@ -149,6 +149,7 @@ RUN set -x \
         bcmath \
         amqp \
         imagick \
+        ffi \
         bz2 \
         calendar \
         exif \
@@ -176,11 +177,17 @@ RUN set -x \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
+    && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \
+    && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \
+    && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \
     && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \

diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile
@@ -188,13 +188,19 @@ RUN set -x \
     && docker-php-ext-install $MEMCACHED \
     && rm -rf $MEMCACHED \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install vips \
     && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install xmlrpc-1.0.0RC3 \
     && docker-php-ext-enable \
         apcu \
+        excimer \
+        opentelemetry \
+        protobuf \
         vips \
         yaml \
         redis \

diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile
@@ -149,6 +149,7 @@ RUN set -x \
         bcmath \
         amqp \
         imagick \
+        ffi \
         bz2 \
         calendar \
         exif \
@@ -176,11 +177,17 @@ RUN set -x \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
+    && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \
+    && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \
+    && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \
     && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \

diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile
@@ -188,13 +188,19 @@ RUN set -x \
     && docker-php-ext-install $MEMCACHED \
     && rm -rf $MEMCACHED \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install vips \
     && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install xmlrpc-1.0.0RC3 \
     && docker-php-ext-enable \
         apcu \
+        excimer \
+        opentelemetry \
+        protobuf \
         vips \
         yaml \
         redis \

diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile
@@ -149,6 +149,7 @@ RUN set -x \
         bcmath \
         amqp \
         imagick \
+        ffi \
         bz2 \
         calendar \
         exif \
@@ -176,11 +177,17 @@ RUN set -x \
         opcache \
     && pecl install memcached \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
+    && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \
+    && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \
+    && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \
     && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -84,6 +84,7 @@
 {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %}
         amqp \
         imagick \
+        ffi \
 {%- endif %}
         bz2 \
         calendar \
@@ -137,11 +138,17 @@
 {%- elif version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %}
     && pecl install memcached \
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install xmlrpc-1.0.0RC3 \
     && pecl install vips \
     && pecl install redis \
     && pecl install mongodb \
     && echo extension=apcu.so > /usr/local/etc/php/conf.d/apcu.ini \
+    && echo extension=excimer.so > /usr/local/etc/php/conf.d/excimer.ini \
+    && echo extension=opentelemetry.so > /usr/local/etc/php/conf.d/opentelemetry.ini \
+    && echo extension=protobuf.so > /usr/local/etc/php/conf.d/protobuf.ini \
     && echo extension=redis.so > /usr/local/etc/php/conf.d/redis.ini \
     && echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
     && echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
@@ -322,13 +329,19 @@
     {%- endif %}
 {%- if version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %}
     && pecl install apcu \
+    && pecl install excimer \
+    && pecl install opentelemetry \
+    && pecl install protobuf \
     && pecl install vips \
     && pecl install yaml \
     && pecl install redis \
     && pecl install mongodb \
     && pecl install xmlrpc-1.0.0RC3 \
     && docker-php-ext-enable \
         apcu \
+        excimer \
+        opentelemetry \
+        protobuf \
         vips \
         yaml \
         redis \