diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91adce7f..9f38ae86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,6 @@ name: CI/CD -on: - workflow_call: +on: push concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/alpine/3.20/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile index 8694a0c4..3a5eabac 100644 --- a/alpine/3.20/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -28,7 +28,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -45,7 +46,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index b3a5f6ff..64cc9b8d 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.20/8.3/Dockerfile b/alpine/3.20/8.3/Dockerfile index d35604d1..c9c961ed 100644 --- a/alpine/3.20/8.3/Dockerfile +++ b/alpine/3.20/8.3/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.20/8.4/Dockerfile b/alpine/3.20/8.4/Dockerfile index fd88cf80..8cd71322 100644 --- a/alpine/3.20/8.4/Dockerfile +++ b/alpine/3.20/8.4/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.21/8.2/Dockerfile b/alpine/3.21/8.2/Dockerfile index 690b4b95..1d006b75 100644 --- a/alpine/3.21/8.2/Dockerfile +++ b/alpine/3.21/8.2/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.21/8.3/Dockerfile b/alpine/3.21/8.3/Dockerfile index 1870728d..1cf3367f 100644 --- a/alpine/3.21/8.3/Dockerfile +++ b/alpine/3.21/8.3/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.21/8.4/Dockerfile b/alpine/3.21/8.4/Dockerfile index 92fbfb7f..f70d7241 100644 --- a/alpine/3.21/8.4/Dockerfile +++ b/alpine/3.21/8.4/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.2/Dockerfile b/alpine/3.22/8.2/Dockerfile index 38efa952..49f54f20 100644 --- a/alpine/3.22/8.2/Dockerfile +++ b/alpine/3.22/8.2/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.3/Dockerfile b/alpine/3.22/8.3/Dockerfile index b19a80ea..998e28a4 100644 --- a/alpine/3.22/8.3/Dockerfile +++ b/alpine/3.22/8.3/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.22/8.4/Dockerfile b/alpine/3.22/8.4/Dockerfile index 0bc87315..cf8d0244 100644 --- a/alpine/3.22/8.4/Dockerfile +++ b/alpine/3.22/8.4/Dockerfile @@ -27,7 +27,8 @@ ARG PHP_RUN_DEPS="\ libxpm \ libxslt \ libzip \ - rabbitmq-c" + rabbitmq-c \ + imagemagick" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +45,8 @@ ARG PHP_BUILD_DEPS="\ libzip-dev \ postgresql-dev \ rabbitmq-c-dev \ - g++" + g++ \ + imagemagick-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -72,7 +74,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/context/php/disabled/imagick.ini b/context/php/disabled/imagick.ini new file mode 100644 index 00000000..f9e8b8ef --- /dev/null +++ b/context/php/disabled/imagick.ini @@ -0,0 +1,2 @@ +[imagick] +extension = imagick.so diff --git a/debian/bullseye/8.0/Dockerfile b/debian/bullseye/8.0/Dockerfile index 981b1a52..64bfdef0 100644 --- a/debian/bullseye/8.0/Dockerfile +++ b/debian/bullseye/8.0/Dockerfile @@ -27,7 +27,9 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm4 \ libxslt1.1 \ - libzip4" + libzip4 \ + libmagickwand-6.q16-6 \ + libmagickcore-6.q16-6" ARG PHP_BUILD_DEPS="\ libbz2-dev \ @@ -41,7 +43,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - librabbitmq-dev" + librabbitmq-dev \ + libmagickwand-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -68,7 +71,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof \ excimer \ - amqp" + amqp \ + imagick" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.1/Dockerfile b/debian/bullseye/8.1/Dockerfile index c6057c65..d676a30a 100644 --- a/debian/bullseye/8.1/Dockerfile +++ b/debian/bullseye/8.1/Dockerfile @@ -28,7 +28,9 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm4 \ libxslt1.1 \ - libzip4" + libzip4 \ + libmagickwand-6.q16-6 \ + libmagickcore-6.q16-6" ARG PHP_BUILD_DEPS="\ libbz2-dev \ @@ -45,7 +47,8 @@ ARG PHP_BUILD_DEPS="\ librabbitmq-dev \ libgrpc-dev \ libprotobuf-dev \ - protobuf-compiler" + protobuf-compiler \ + libmagickwand-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -75,7 +78,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ amqp \ grpc \ protobuf \ - opentelemetry" + opentelemetry \ + imagick" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.2/Dockerfile b/debian/bullseye/8.2/Dockerfile index 8cde7c37..0fa56762 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -28,7 +28,9 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm4 \ libxslt1.1 \ - libzip4" + libzip4 \ + libmagickwand-6.q16-6 \ + libmagickcore-6.q16-6" ARG PHP_BUILD_DEPS="\ libbz2-dev \ @@ -45,7 +47,8 @@ ARG PHP_BUILD_DEPS="\ librabbitmq-dev \ libgrpc-dev \ libprotobuf-dev \ - protobuf-compiler" + protobuf-compiler \ + libmagickwand-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -76,7 +79,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ amqp \ grpc \ protobuf \ - opentelemetry" + opentelemetry \ + imagick" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.3/Dockerfile b/debian/bullseye/8.3/Dockerfile index e744383c..8f2dc731 100644 --- a/debian/bullseye/8.3/Dockerfile +++ b/debian/bullseye/8.3/Dockerfile @@ -28,7 +28,9 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm4 \ libxslt1.1 \ - libzip4" + libzip4 \ + libmagickwand-6.q16-6 \ + libmagickcore-6.q16-6" ARG PHP_BUILD_DEPS="\ libbz2-dev \ @@ -45,7 +47,8 @@ ARG PHP_BUILD_DEPS="\ librabbitmq-dev \ libgrpc-dev \ libprotobuf-dev \ - protobuf-compiler" + protobuf-compiler \ + libmagickwand-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -76,7 +79,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ amqp \ grpc \ protobuf \ - opentelemetry" + opentelemetry \ + imagick" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.4/Dockerfile b/debian/bullseye/8.4/Dockerfile index b6bf3a5b..21389ae5 100644 --- a/debian/bullseye/8.4/Dockerfile +++ b/debian/bullseye/8.4/Dockerfile @@ -28,7 +28,9 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm4 \ libxslt1.1 \ - libzip4" + libzip4 \ + libmagickwand-6.q16-6 \ + libmagickcore-6.q16-6" ARG PHP_BUILD_DEPS="\ libbz2-dev \ @@ -45,7 +47,8 @@ ARG PHP_BUILD_DEPS="\ librabbitmq-dev \ libgrpc-dev \ libprotobuf-dev \ - protobuf-compiler" + protobuf-compiler \ + libmagickwand-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -76,7 +79,8 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ amqp \ grpc \ protobuf \ - opentelemetry" + opentelemetry \ + imagick" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \