From 3c4592a26f36b0d5451ed5b3e43e893aa8dc6857 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sat, 27 Jan 2024 22:17:24 +0100
Subject: [PATCH] Move compsoer install & install reports to its own step.

---
 php/Dockerfile.Core | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/php/Dockerfile.Core b/php/Dockerfile.Core
index 837c4b4..658be17 100644
--- a/php/Dockerfile.Core
+++ b/php/Dockerfile.Core
@@ -29,10 +29,6 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
         && \
     apt-get autoremove -yqq && \
     apt-get clean && \
-    curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
-    chmod +x /usr/local/bin/composer /usr/bin/install-report && \
-    composer self-update ${COMPOSER_UPDATE_FLAGS} && \
-    /usr/bin/install-report && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \
     rm -rf  /usr/bin/mariabackup \
             /usr/bin/mysql_embedded \
@@ -51,3 +47,10 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
             /usr/bin/mysqlshow \
             /usr/bin/mysqlslap \
             /usr/bin/mytop
+
+RUN chmod +x /usr/bin/install-report && \
+    /usr/bin/install-report
+
+RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \
+    chmod +x /usr/local/bin/composer /usr/bin/install-report && \
+    composer self-update ${COMPOSER_UPDATE_FLAGS}