From 00e54c9c234257ca6c6f433cd66474e4f8833eed Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 24 Jan 2025 11:41:37 +1100
Subject: [PATCH] Change the way we invoke install php extensions

---
 .github/workflows/build-image-v5.yaml | 14 +-------------
 alpine/5/Dockerfile                   |  9 ++++++++-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-image-v5.yaml b/.github/workflows/build-image-v5.yaml
index b207760..a729955 100644
--- a/.github/workflows/build-image-v5.yaml
+++ b/.github/workflows/build-image-v5.yaml
@@ -21,19 +21,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Add swap space
-        run: |
-          sudo fallocate -l 4G /swapfile
-          sudo chmod 600 /swapfile
-          sudo mkswap /swapfile
-          sudo swapon /swapfile
-          free -h
-
-      - name: Set MAKEFLAGS for parallel make jobs
-        run: |
-          export MAKEFLAGS="-j2"
-          echo "MAKEFLAGS set to: $MAKEFLAGS"
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
         with:
@@ -66,5 +53,6 @@ jobs:
 
       - name: Move cache
         run: |
+        mkdir -p /tmp/.buildx-cache
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
\ No newline at end of file
diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile
index ae59378..ec257de 100644
--- a/alpine/5/Dockerfile
+++ b/alpine/5/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
     ttf-dejavu
 
 # Install PHP extensions
-RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \
+# RUN ( curl -sSLf https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - || echo 'return 1' ) | sh -s \
+#     ${php_require} \
+#     ${php_suggest} \
+#     ${php_extra}
+
+RUN wget -O /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
+    && chmod +x /usr/local/bin/install-php-extensions \
+    && install-php-extensions \
     ${php_require} \
     ${php_suggest} \
     ${php_extra}