From 0b12047b28a35c7b67783df344789dcd3838d4a6 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Fri, 24 Sep 2021 19:43:28 +0200
Subject: [PATCH 1/2] Enable mbstring

---
 src/main/php/xp/lambda/Dockerfile.runtime | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/php/xp/lambda/Dockerfile.runtime b/src/main/php/xp/lambda/Dockerfile.runtime
index c57e285..01180c2 100755
--- a/src/main/php/xp/lambda/Dockerfile.runtime
+++ b/src/main/php/xp/lambda/Dockerfile.runtime
@@ -14,6 +14,7 @@ RUN yum clean all && yum install -y \
   re2c \
   openssl-devel \
   libxml2-devel \
+  oniguruma-devel \
   tar \
   zip \
   bison-3.0.4-2.el7.x86_64.rpm
@@ -25,6 +26,7 @@ RUN cd php-src-php-${php_version} && ./buildconf --force && ./configure \
   --prefix=/opt/php/ \
   --without-sqlite3 \
   --with-openssl \
+  --enable-mbstring \
   --enable-bcmath \
   --disable-simplexml \
   --disable-pdo && \

From bee02b0c8ed5dd9a9242995a3ef30e322e62f7c4 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Fri, 24 Sep 2021 20:22:27 +0200
Subject: [PATCH 2/2] Fix "php: error while loading shared libraries:
 libonig.so.2"

---
 src/main/php/xp/lambda/Dockerfile.test | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/php/xp/lambda/Dockerfile.test b/src/main/php/xp/lambda/Dockerfile.test
index 73228fd..50291a3 100755
--- a/src/main/php/xp/lambda/Dockerfile.test
+++ b/src/main/php/xp/lambda/Dockerfile.test
@@ -9,4 +9,8 @@ COPY --from=runtime /opt/php/bin/ /opt/bin/
 
 COPY --from=runtime /opt/php/bootstrap /opt/bootstrap
 
+COPY --from=runtime /usr/lib64/libonig.so.2 /opt/bin
+
+ENV LD_LIBRARY_PATH=/opt/bin/
+
 ENV TZ UTC
\ No newline at end of file