From a5effb9e3bf31627e3c5ef57a6e0eb678340ccd0 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Mon, 21 Mar 2022 00:32:59 +0100
Subject: [PATCH] Ensure PHP extension directory exists

---
 Dockerfiles/Dockerfile.jessie       | 6 +++++-
 Dockerfiles/Dockerfile.jessie-arm64 | 6 +++++-
 Dockerfiles/Dockerfile.stretch      | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Dockerfiles/Dockerfile.jessie b/Dockerfiles/Dockerfile.jessie
index c2ccff5..b663ae6 100644
--- a/Dockerfiles/Dockerfile.jessie
+++ b/Dockerfiles/Dockerfile.jessie
@@ -19,6 +19,7 @@ ENV PHP_BUILD_DEPS \
 	libbison-dev \
 	libcurl4-openssl-dev \
 	libfl-dev \
+	libmhash-dev \
 	libmysqlclient-dev \
 	libpcre3-dev \
 	libreadline6-dev \
@@ -29,6 +30,7 @@ ENV PHP_BUILD_DEPS \
 	libxml2-dev
 
 ENV PHP_RUNTIME_DEPS \
+	libmhash2 \
 	libmysqlclient18 \
 	libpcre3 \
 	librecode0 \
@@ -203,7 +205,9 @@ RUN set -eux \
 		${PHP_RUNTIME_DEPS} \
 		${RUNTIME_TOOLS} \
 	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/* \
+# Setup extension dir
+	&& mkdir -p "$(php -r 'echo ini_get("extension_dir");')"
 
 
 COPY data/docker-php-* /usr/local/bin/
diff --git a/Dockerfiles/Dockerfile.jessie-arm64 b/Dockerfiles/Dockerfile.jessie-arm64
index 43a9dfa..e4e143d 100644
--- a/Dockerfiles/Dockerfile.jessie-arm64
+++ b/Dockerfiles/Dockerfile.jessie-arm64
@@ -19,6 +19,7 @@ ENV PHP_BUILD_DEPS \
 	libbison-dev \
 	libcurl4-openssl-dev \
 	libfl-dev \
+	libmhash-dev \
 	libmysqlclient-dev \
 	libpcre3-dev \
 	libreadline6-dev \
@@ -29,6 +30,7 @@ ENV PHP_BUILD_DEPS \
 	libxml2-dev
 
 ENV PHP_RUNTIME_DEPS \
+	libmhash2 \
 	libmysqlclient18 \
 	libpcre3 \
 	librecode0 \
@@ -230,7 +232,9 @@ RUN set -eux \
 		${PHP_RUNTIME_DEPS} \
 		${RUNTIME_TOOLS} \
 	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/* \
+# Setup extension dir
+	&& mkdir -p "$(php -r 'echo ini_get("extension_dir");')"
 
 
 COPY data/docker-php-* /usr/local/bin/
diff --git a/Dockerfiles/Dockerfile.stretch b/Dockerfiles/Dockerfile.stretch
index 5c774c7..7137f7b 100644
--- a/Dockerfiles/Dockerfile.stretch
+++ b/Dockerfiles/Dockerfile.stretch
@@ -17,6 +17,7 @@ ENV PHP_BUILD_DEPS \
 	libbison-dev \
 	libcurl4-openssl-dev \
 	libfl-dev \
+	libmhash-dev \
 	libmariadbclient-dev-compat \
 	libpcre3-dev \
 	libreadline6-dev \
@@ -27,6 +28,7 @@ ENV PHP_BUILD_DEPS \
 	libxml2-dev
 
 ENV PHP_RUNTIME_DEPS \
+	libmhash2 \
 	libmariadbclient-dev-compat \
 	libpcre3 \
 	librecode0 \
@@ -204,7 +206,9 @@ RUN set -eux \
 		${PHP_RUNTIME_DEPS} \
 		${RUNTIME_TOOLS} \
 	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/* \
+# Setup extension dir
+	&& mkdir -p "$(php -r 'echo ini_get("extension_dir");')"
 
 
 COPY data/docker-php-* /usr/local/bin/