From 189ce1cdff245c48eb3b7524ad58b1d7058bc627 Mon Sep 17 00:00:00 2001 From: tancou Date: Wed, 9 Feb 2022 18:20:34 +0100 Subject: [PATCH 1/2] Do not install tokenizer into php-worker when php version is 8.1 --- php-worker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 7414459..8620a59 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -38,7 +38,12 @@ RUN apk --update add wget \ RUN pecl channel-update pecl.php.net; \ - docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl + docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ + php -m | grep -q 'tokenizer'; \ + else \ + docker-php-ext-install tokenizer; \ + fi # Add a non-root user: ARG PUID=1000 From 349ba1ea5021464aebc8472b4bd608467ca46f36 Mon Sep 17 00:00:00 2001 From: tancou Date: Sun, 13 Feb 2022 16:38:47 +0100 Subject: [PATCH 2/2] fix amqp installation --- php-worker/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index 8620a59..ee6d189 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -262,15 +262,16 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ ARG INSTALL_AMQP=false RUN if [ ${INSTALL_AMQP} = true ]; then \ + docker-php-ext-install sockets; \ apk --update add -q rabbitmq-c rabbitmq-c-dev && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ - printf "\n" | pecl install amqp-1.11.0beta; \ + printf "\n" | pecl install amqp-1.11.0; \ else \ - printf "\n" | pecl install amqp; \ + printf "\n" | pecl install amqp; \ fi && \ - docker-php-ext-enable amqp && \ - apk del -q rabbitmq-c-dev && \ - docker-php-ext-install sockets \ + docker-php-ext-enable amqp && \ + apk del -q rabbitmq-c-dev; \ + php -m | grep -oiE '^amqp$' \ ;fi # Install Gearman: