From 5bd3817a3aaf16b693e5effcc8a52b28d593841f Mon Sep 17 00:00:00 2001
From: itismadness <itismadness@orpheus.network>
Date: Thu, 30 Sep 2021 21:50:28 +0000
Subject: [PATCH] Fix installing composer in Dockerfile

---
 Dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d169fe0e8..9d4be335a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,14 +58,7 @@ RUN apt-get update \
     && apt-get autoremove \
     && rm -rf /var/lib/apt/lists/*
 
-RUN cd /tmp \
-    # install our own copy of composer as the one included in debian:buster-slim is too old
-    # to work properly with PHP8+
-    && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
-    && php composer-setup.php \
-    && php -r "unlink('composer-setup.php');" \
-    && mv composer.phar /usr/local/bin/composer
+COPY --from=composer:2.1 /usr/bin/composer /usr/local/bin/composer
 
 # Python tools layer
 RUN pip3 install chardet eac-logchecker xld-logchecker