From 57efb4a31b4107637ead11b178cf844ea7b7759c Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Fri, 27 Dec 2024 01:58:28 +0700
Subject: [PATCH] Added missing iconv and mbstring for composer to run

---
 7/Dockerfile.alpine        | 3 ++-
 7/Dockerfile.apache-alpine | 3 ++-
 7/scripts/alpine-setup.sh  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine
index 4323ef2..c139c50 100644
--- a/7/Dockerfile.alpine
+++ b/7/Dockerfile.alpine
@@ -29,7 +29,8 @@ ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/c
 RUN /bin/mkdir -p /app ; \
     /sbin/apk add --update --no-cache \
               php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \
-              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \
+              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \
+              php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \
     /bin/chmod +x /tmp/setup.sh /usr/local/bin/composer ; \
     /bin/sh /tmp/setup.sh; \
     /bin/rm -f /tmp/*.sh;
diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine
index 3627a83..1275a0e 100644
--- a/7/Dockerfile.apache-alpine
+++ b/7/Dockerfile.apache-alpine
@@ -31,7 +31,8 @@ ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/c
 RUN /bin/mkdir -p /app ; \
     /sbin/apk add --update --no-cache \
               php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \
-              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \
+              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \
+              php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \
     /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer;  \
     /bin/sh /tmp/setup.sh; \
     /bin/rm -f /tmp/*.sh; 
diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh
index f6e4092..0dbd77d 100644
--- a/7/scripts/alpine-setup.sh
+++ b/7/scripts/alpine-setup.sh
@@ -3,8 +3,8 @@
 PHP_LIST="bcmath,brotli,bz2,calendar,cgi,
 ctype,curl,dba,dom,embed,
 enchant,exif,fileinfo,ftp,gd,
-gettext,gmp,iconv,imap,intl,
-json,ldap,mbstring,opcache,openssl,
+gettext,gmp,imap,intl,
+json,ldap,opcache,openssl,
 pcntl,pdo,pear,posix,
 pspell,shmop,snmp,soap,sockets,
 sysvmsg,sysvsem,sysvshm,tidy,tokenizer,