From c5cb38dfe803b3f6ae41bfe03feb39684f62c56c Mon Sep 17 00:00:00 2001
From: Ondrej Vlach <ondrej@vlach.xyz>
Date: Sat, 25 Jan 2025 18:55:11 +0100
Subject: [PATCH] wrap install php-extensions

---
 install-php-extensions-wrapper.sh | 10 ++++++++++
 php-8.4-fpm-base.Dockerfile       | 23 ++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 install-php-extensions-wrapper.sh

diff --git a/install-php-extensions-wrapper.sh b/install-php-extensions-wrapper.sh
new file mode 100644
index 0000000..4168c28
--- /dev/null
+++ b/install-php-extensions-wrapper.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+echo "Installing $@"
+/sbin/install-php-extensions $@ > /tmp/build.log
+RETCODE=$?
+
+if [ $RETCODE -ne 0 ]; then
+  tail -n 500 /tmp/build.log
+fi
+
+exit $RETCODE
diff --git a/php-8.4-fpm-base.Dockerfile b/php-8.4-fpm-base.Dockerfile
index c3112ad..f05b94c 100644
--- a/php-8.4-fpm-base.Dockerfile
+++ b/php-8.4-fpm-base.Dockerfile
@@ -5,16 +5,17 @@ RUN usermod -a -G www-data root
 RUN mkdir -p /var/www/html
 RUN chown -R www-data:www-data /var/www/html
 RUN curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o /sbin/install-php-extensions
-RUN chmod u+x /sbin/install-php-extensions
-RUN /sbin/install-php-extensions opentelemetry-php/ext-opentelemetry@1.1.2
-RUN /sbin/install-php-extensions opcache
-RUN /sbin/install-php-extensions zip
-RUN /sbin/install-php-extensions grpc
-RUN /sbin/install-php-extensions grpc
-RUN /sbin/install-php-extensions intl
-RUN /sbin/install-php-extensions calendar
-RUN /sbin/install-php-extensions pdo_mysql
-RUN /sbin/install-php-extensions mysqli
-RUN /sbin/install-php-extensions redis
+COPY ./install-php-extensions-wrapper.sh /sbin/install-php-extensions-wrapper
+RUN chmod u+x /sbin/install-php-extensions /sbin/install-php-extensions-wrapper
+RUN /sbin/install-php-extensions-wrapper opentelemetry-php/ext-opentelemetry@1.1.2
+RUN /sbin/install-php-extensions-wrapper opcache
+RUN /sbin/install-php-extensions-wrapper zip
+RUN /sbin/install-php-extensions-wrapper grpc
+RUN /sbin/install-php-extensions-wrapper grpc
+RUN /sbin/install-php-extensions-wrapper intl
+RUN /sbin/install-php-extensions-wrapper calendar
+RUN /sbin/install-php-extensions-wrapper pdo_mysql
+RUN /sbin/install-php-extensions-wrapper mysqli
+RUN /sbin/install-php-extensions-wrapper redis
 
 WORKDIR /var/www/html/