From 48e4eb97aed3fc8599455125b35fc585cee9e37b Mon Sep 17 00:00:00 2001
From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
Date: Fri, 4 Dec 2020 17:54:21 +0100
Subject: [PATCH] Fix php-imap
---
.s2i/bin/assemble | 3 ---
Dockerfile | 7 +++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
index b1758b3..1c26aff 100644
--- a/.s2i/bin/assemble
+++ b/.s2i/bin/assemble
@@ -13,6 +13,3 @@ sed -ri \
echo "Assembling"
/usr/libexec/s2i/assemble
-
-echo "Extra libs"
-php composer.phar require php-imap/php-imap
diff --git a/Dockerfile b/Dockerfile
index bfe7a58..a0d7f16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,12 @@ RUN yum install -y \
RUN yum install -y \
php-imap
+# Fix php-imap location
+RUN cp /etc/php.d/imap.ini /etc/opt/rh/rh-php73/php.d/20-imap.ini
+RUN cp /etc/php.d/imap.ini \
+ /opt/rh/rh-php73/register.content/etc/opt/rh/rh-php73/php.d/20-imap.ini
+RUN cp /usr/lib64/php/modules/imap.so \
+ /opt/rh/rh-php73/root/usr/lib64/php/modules/imap.so
+
# Make sure the final image runs as unprivileged user
USER 1001
--
GitLab