From d12dee4fce3b4e60db6110893f173fd5f7d93c5d Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Wed, 18 Dec 2024 01:49:00 +0700
Subject: [PATCH] Composer now available on all images

---
 5/Dockerfile.alpine       | 26 +++++++++++++++++++++-----
 5/scripts/alpine-setup.sh |  4 ++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/5/Dockerfile.alpine b/5/Dockerfile.alpine
index e96f11a..0815fdd 100644
--- a/5/Dockerfile.alpine
+++ b/5/Dockerfile.alpine
@@ -9,23 +9,39 @@ ARG WITH_APACHE=false
 ARG WITH_DATABASE=false
 ARG PHP_VERSION=5.6
 ARG PHP_VER_SHORT=5
+ARG COMPOSER_VERSION=2.2.25
+ARG COMPOSER_VER_SHORT=2.2
 
 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}
+ENV COMPOSER_VER_SHORT=${COMPOSER_VER_SHORT}
 
-WORKDIR /root
+# Set composer home
+ENV COMPOSER_HOME=/app
+ENV COMPOSER_CACHE_DIR=${COMPOSER_HOME}/cache
 
-ADD 5/scripts/alpine-setup.sh /tmp/setup.sh
+WORKDIR /tmp
+
+ADD 5/scripts/alpine-setup.sh ./setup.sh
+
+# Download and install composer
+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 ; \
+RUN /bin/mkdir -p ${COMPOSER_HOME}/build ${COMPOSER_CACHE_DIR}/files \
+    ${COMPOSER_CACHE_DIR}/repo ${COMPOSER_CACHE_DIR}/vcs ; \
+    /app ; \
+    /usr/sbin/addgroup -g 10001 php ; \
+    /usr/sbin/adduser -D -u 10001 -G php -s /sbin/nologin -h ${COMPOSER_HOME}/build php ; \
+    /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/5/scripts/alpine-setup.sh b/5/scripts/alpine-setup.sh
index ae2311f..903fae6 100644
--- a/5/scripts/alpine-setup.sh
+++ b/5/scripts/alpine-setup.sh
@@ -35,8 +35,8 @@ fi
 # Only setup apache with full flavor parameters
 if [ "$WITH_APACHE" == "true" ]; then
     if [ "$FLAVOR" == "full" ] || [ "$FLAVOR" == "debug" ]; then
-        /usr/sbin/addgroup -g 10001 apache ;
-        /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ;
+        /usr/sbin/addgroup -g 10002 apache ;
+        /usr/sbin/adduser -D -u 10002 -G apache -s /sbin/nologin -h $APP_ROOT apache ;
         /sbin/apk add --update --no-cache apache2 php$PHP_VER_SHORT-apache2 ;
 
         sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf ;