From cc42eb6d4faaafd465cd45572f1359f37f1c8763 Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Fri, 27 Dec 2024 00:26:48 +0700
Subject: [PATCH] Added composer for all php7 image

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

diff --git a/7/Dockerfile.alpine b/7/Dockerfile.alpine
index 72e03fc..6fb18f0 100644
--- a/7/Dockerfile.alpine
+++ b/7/Dockerfile.alpine
@@ -11,23 +11,26 @@ ARG WITH_APACHE=false
 ARG WITH_DATABASE=false
 ARG PHP_VERSION=7.4
 ARG PHP_VER_SHORT=7
+ARG COMPOSER_VERSION=2.8.4
 
 ENV FLAVOR=${FLAVOR}
 ENV WITH_APACHE=${WITH_APACHE}
 ENV WITH_DATABASE=${WITH_DATABASE}
 ENV PHP_VERSION=${PHP_VERSION}
 ENV PHP_VER_SHORT=${PHP_VER_SHORT}
+ENV COMPOSER_VERSION=${COMPOSER_VERSION}
 
 WORKDIR /root
 
 ADD 7/scripts/alpine-setup.sh /tmp/setup.sh
+ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
 
 # Create directory, and install required php app
 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 ; \
-    /bin/chmod +x /tmp/setup.sh; \
+              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \
+    /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 5c64c41..3627a83 100644
--- a/7/Dockerfile.apache-alpine
+++ b/7/Dockerfile.apache-alpine
@@ -11,6 +11,7 @@ ARG WITH_APACHE=false
 ARG WITH_DATABASE=false
 ARG PHP_VERSION=7.4
 ARG PHP_VER_SHORT=7
+ARG COMPOSER_VERSION=2.8.4
 
 ENV FLAVOR=${FLAVOR}
 ENV WITH_APACHE=${WITH_APACHE}
@@ -18,20 +19,22 @@ ENV WITH_DATABASE=${WITH_DATABASE}
 ENV PHP_VERSION=${PHP_VERSION}
 ENV PHP_VER_SHORT=${PHP_VER_SHORT}
 ENV SERVER_ROOT=/app
+ENV COMPOSER_VERSION=${COMPOSER_VERSION}
 
 WORKDIR /root
 
 ADD 7/scripts/alpine-setup.sh /tmp/setup.sh
 ADD scripts/entrypoint.sh /usr/local/bin/
+ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /usr/local/bin/composer
 
 # Create directory, and install required php app
 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 ; \
-    /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh ;  \
+              php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar ; \
+    /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;
+    /bin/rm -f /tmp/*.sh; 
 
 ADD htdocs ${SERVER_ROOT}/htdocs
 
diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh
index 7844136..f6e4092 100644
--- a/7/scripts/alpine-setup.sh
+++ b/7/scripts/alpine-setup.sh
@@ -5,7 +5,7 @@ ctype,curl,dba,dom,embed,
 enchant,exif,fileinfo,ftp,gd,
 gettext,gmp,iconv,imap,intl,
 json,ldap,mbstring,opcache,openssl,
-pcntl,pdo,pear,phar,posix,
+pcntl,pdo,pear,posix,
 pspell,shmop,snmp,soap,sockets,
 sysvmsg,sysvsem,sysvshm,tidy,tokenizer,
 xml,xmlreader,xmlrpc,xsl,zip"