From fd0b68f73ba30da2c286954e022766aad73d78c7 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Mon, 19 Aug 2024 21:45:09 +0100
Subject: [PATCH] Fix: Docker container does not build locally

Instead of installing PHP extensions via `apk` _(Which fails)_, use `mlocati/docker-php-extension-installer`

Also fix missing step in README that causes `composer build` to fail

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 .docker/php/Dockerfile | 27 ++++++++++++++-------------
 README.md              |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.docker/php/Dockerfile b/.docker/php/Dockerfile
index 51473b5c..21869d2b 100644
--- a/.docker/php/Dockerfile
+++ b/.docker/php/Dockerfile
@@ -15,20 +15,21 @@ RUN mkdir -p /assets && mv /work/build/* /assets
 # Build the PHP container
 FROM php:8.3-fpm-alpine
 
-# System dependencies
-# RUN mkdir -p /etc/apk && echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories
 RUN apk update && \
-  apk add --no-cache \
-    bash \
-    php8-bcmath \
-    php8-bz2 \
-    php8-dom \
-    php8-intl \
-    php8-opcache \
-    php8-pcntl \
-    php8-sockets \
-    php8-xsl \
-    php8-zip
+    apk add --no-cache bash
+
+ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN chmod +x /usr/local/bin/install-php-extensions && \
+    install-php-extensions \
+    bcmath \
+    bz2 \
+    dom \
+    intl \
+    opcache \
+    pcntl \
+    sockets \
+    xsl \
+    zip
 
 # PHP configuration
 COPY .docker/php/getlaminas.ini /usr/local/etc/php/conf.d/999-getlaminas.ini
diff --git a/README.md b/README.md
index c64938a2..42e02f10 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ Fourth, prepare the blog and security announcements:
 
 ```bash
 $ mkdir -p var/blog/feeds
+$ mkdir -p public/js
 $ composer build
 ```