From bc26f7b881f2ab1af1a6c7c39ac74b42c88e09ae Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 9 Jul 2021 13:19:21 +1000
Subject: [PATCH] Fixes for composers new configuration

---
 .gitlab-test.yml | 4 ++--
 Dockerfile       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-test.yml b/.gitlab-test.yml
index 45c98b1..0145f01 100644
--- a/.gitlab-test.yml
+++ b/.gitlab-test.yml
@@ -24,8 +24,8 @@ test:
     - mv .env.testing .env
 
     # Install Composer and project dependencies.
-    - mkdir -p /root/.composer
-    - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > /root/.composer/auth.json ; fi
+    - mkdir -p /root/.config/composer
+    - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > /root/.config/composer/auth.json ; fi
     - composer install
 
     # Generate an application key. Re-cache.
diff --git a/Dockerfile b/Dockerfile
index ddb366a..955b9ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,12 @@ FROM registry.leenooks.net/leenooks/php:8.0-fpm-image
 
 COPY . /var/www/html/
 
-RUN mkdir /var/www/.composer \
+RUN export COMPOSER_HOME=/var/www/.composer \
+	&& mkdir -p /var/www/.composer \
 	&& ([ -r auth.json ] && mv auth.json /var/www/.composer/) || true \
 	&& touch .composer.refresh \
 	&& mv .env.example .env \
 	&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
 	&& chmod +x /var/www/html/artisan \
 	&& touch .migrate \
-	&& rm -rf /var/www/.composer/*
+	&& rm -rf /var/www/.composer