From a718f492486ba01b5e4fd9a8c2999c712b66d76e Mon Sep 17 00:00:00 2001 From: Hans Tuscher Date: Tue, 6 Aug 2024 11:23:56 +0200 Subject: [PATCH] task: add excimer, opentelemetry --- README.md | 24 +++++++++++------------ docker/php-official/8.0-alpine/Dockerfile | 6 ++++++ docker/php-official/8.0/Dockerfile | 7 +++++++ docker/php-official/8.1-alpine/Dockerfile | 6 ++++++ docker/php-official/8.1/Dockerfile | 7 +++++++ docker/php-official/8.2-alpine/Dockerfile | 6 ++++++ docker/php-official/8.2/Dockerfile | 7 +++++++ docker/php-official/8.3-alpine/Dockerfile | 6 ++++++ docker/php-official/8.3/Dockerfile | 7 +++++++ template/Dockerfile/images/php.jinja2 | 13 ++++++++++++ 10 files changed, 77 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 848e9742d..027df1a8b 100644 --- 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 index adaf7cd2c..32eaf9688 100644 --- a/docker/php-official/8.0-alpine/Dockerfile +++ b/docker/php-official/8.0-alpine/Dockerfile @@ -191,6 +191,9 @@ 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 \ @@ -198,6 +201,9 @@ RUN set -x \ && 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 index 6c2db0712..57ac73ccf 100644 --- 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 index 410833bb6..0e37ad44a 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -188,6 +188,9 @@ 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 \ @@ -195,6 +198,9 @@ RUN set -x \ && 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 index 165f76b6c..2ec1c0c33 100644 --- 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 index 16155a78b..9eae4960e 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -188,6 +188,9 @@ 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 \ @@ -195,6 +198,9 @@ RUN set -x \ && 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 index ac4c78ac3..a27f2ac23 100644 --- 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 index a8727bd9d..2cf4b1f11 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -188,6 +188,9 @@ 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 \ @@ -195,6 +198,9 @@ RUN set -x \ && 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 index 763f02043..ee05344af 100644 --- 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 index bdc472fa3..3f6791842 100644 --- 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,6 +329,9 @@ {%- 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 \ @@ -329,6 +339,9 @@ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \