From a7ff52150d589ad3524a3b5d7dcd36605e0f51eb Mon Sep 17 00:00:00 2001
From: Aditya Prima <aprimediet@gmail.com>
Date: Sun, 24 Mar 2024 14:57:35 +0700
Subject: [PATCH] Updated composer cache settings

---
 Dockerfile.alpine | 6 +-----
 Dockerfile.ubuntu | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 2756593..017b4ce 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -57,12 +57,8 @@ RUN php composer-setup.php --version=${COMPOSER_VERSION} && mv composer.phar /us
 ENV COMPOSER_HOME /usr/local/share/composer
 ENV COMPOSER_CACHE_DIR ${COMPOSER_HOME}/cache
 
-RUN mkdir -p $COMPOSER_HOME && \
-    composer config --global home ${COMPOSER_HOME} \
-    composer config --global cache-dir ${COMPOSER_CACHE_DIR}
-
 # CREATE CACHES DIR FOR COMPOSER
 RUN mkdir -p ${COMPOSER_CACHE_DIR}/{files,repo,vcs}
 
 # CLEAN APK CACHES
-RUN rm -vrf /var/cache/apk/*
\ No newline at end of file
+RUN rm -vrf /var/cache/apk/* && rm -rf /root/.composer; exit 0
\ No newline at end of file
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 8f21c53..b796671 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -18,3 +18,10 @@ RUN --mount=type=cache,target=/var/cache/apt/archives \
 # DOWNLOAD AND INSTALL COMPOSER
 ADD https://getcomposer.org/installer ./composer-setup.php
 RUN php composer-setup.php --version=${COMPOSER_VERSION} && mv composer.phar /usr/local/bin/composer && rm -f ./composer-setup.php
+
+# SET COMPOSER HOME
+ENV COMPOSER_HOME /usr/local/share/composer
+ENV COMPOSER_CACHE_DIR ${COMPOSER_HOME}/cache
+
+# CREATE CACHES DIR FOR COMPOSER
+RUN mkdir -p ${COMPOSER_CACHE_DIR}/{files,repo,vcs}