Use composer from distribution

Author: vmcj

docker/domserver/Dockerfile

@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \
 	autoconf automake git pkg-config \
-	gcc g++ make acl zip unzip \
+	gcc g++ make acl zip unzip composer \
 	php-cli php-zip php-bcmath \
 	php-gd php-curl php-mysql php-json php-intl \
 	php-gmp php-xml php-mbstring \
@@ -25,11 +25,6 @@ RUN python3 -m venv /venv && . /venv/bin/activate && pip3 install sphinx sphinx-
 # Set up user
 RUN useradd -m domjudge
 
-# Install composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-	&& php composer-setup.php \
-	&& mv /composer.phar /usr/local/bin/composer
-
 # Add DOMjudge source code and build script
 ADD domjudge.tar.gz /domjudge-src
 COPY domserver/build.sh /domjudge-src/build.sh
@@ -58,18 +53,13 @@ RUN useradd -m domjudge
 RUN apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \
 	acl curl zip unzip supervisor mariadb-client pv apache2-utils \
-	nginx php-cli php-fpm php-zip php-bcmath \
+	nginx php-cli php-fpm php-zip php-bcmath composer \
 	php-gd php-curl php-mysql php-json php-intl \
 	php-gmp php-xml php-mbstring php-ldap \
 	enscript lpr \
 	ca-certificates python3-yaml python3-requests \
 	&& rm -rf /var/lib/apt/lists/*
 
-# Install composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-	&& php composer-setup.php \
-	&& mv /composer.phar /usr/local/bin/composer
-
 # Copy domserver
 COPY --from=domserver-build /opt/domjudge/domserver /opt/domjudge/domserver
 COPY --from=domserver-build /opt/domjudge/doc /opt/domjudge/doc

docker/judgehost/Dockerfile.build

@@ -10,7 +10,7 @@ RUN apt-get update \
 	gcc g++ make zip unzip \
 	php-cli php-zip lsb-release debootstrap \
 	php-gd php-curl php-mysql php-json \
-	php-gmp php-xml php-mbstring \
+	php-gmp php-xml php-mbstring composer \
 	sudo bsdmainutils ntp libcgroup-dev procps \
 	libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
 	ca-certificates \
@@ -19,12 +19,6 @@ RUN apt-get update \
 # Set up user
 RUN useradd -m domjudge
 
-# Install composer
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-	&& php composer-setup.php \
-	&& mv /composer.phar /usr/local/bin/composer
-
 # Add DOMjudge source code and build script
 ADD domjudge.tar.gz /domjudge-src
 ADD judgehost/build.sh /domjudge-src