Install additional PHP versions

Author: vmcj

docker-contributor/Dockerfile

@@ -11,7 +11,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
   MYSQL_ROOT_PASSWORD=domjudge \
   FPM_MAX_CHILDREN=40 \
   DJ_SKIP_MAKE=0 \
-  DJ_DB_INSTALL_BARE=0
+  DJ_DB_INSTALL_BARE=0 \
+  PHPSUPPORTED="7.2 7.3 8.0 8.1" \
+  APTINSTALL="apt install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
 
 # Install required packages and clean up afterwards to make this image layer smaller
 RUN apt update \
@@ -32,7 +34,7 @@ RUN apt update \
     supervisor apache2-utils lsb-release \
     libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
     enscript lpr ca-certificates less vim \
-    php-pear php-dev \
+    php-pear php-dev software-properties-common \
     && pecl install pcov \
     && rm -rf /var/lib/apt/lists/*
 
@@ -56,6 +58,21 @@ RUN apt update && \
     && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && php composer-setup.php \
     && mv /composer.phar /usr/local/bin/composer
 
+# Install all supported PHP versions
+RUN add-apt-repository ppa:ondrej/php -y && apt update
+RUN for VERSION in $PHPSUPPORTED; do \
+        $APTINSTALL php${VERSION}; \
+    done
+RUN PACKAGES=$(dpkg-query -f '${binary:Package}\n' -W|grep "^php.*-"); \
+    for PACKAGE in $PACKAGES; do \
+        PACKAGEALLVERSIONS="" && \
+        for VERSION in $PHPSUPPORTED; do \
+            PACKAGEALLVERSIONS="$PACKAGEALLVERSIONS php${VERSION}-${PACKAGE#php*-}"; \
+        done; \
+        $APTINSTALL $PACKAGEALLVERSIONS; \
+    done
+RUN update-alternatives --set php /usr/bin/php7.4
+
 # Add exposed volume
 VOLUME ["/domjudge"]
 
@@ -64,6 +81,11 @@ WORKDIR /domjudge
 # Add PHP configuration
 COPY ["php-config", "//etc/php/7.4/fpm/conf.d"]
 COPY ["php-config", "//etc/php/7.4/cli/conf.d"]
+RUN for VERSION in $PHPSUPPORTED; do \
+        for DIR in fpm cli; do \
+            cp /etc/php/7.4/$DIR/conf.d/* /etc/php/$VERSION/$DIR/conf.d/; \
+        done; \
+    done
 
 # Disable Xdebug by default
 RUN phpdismod xdebug

docker-gitlabci/Dockerfile

@@ -1,5 +1,7 @@
 FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
+ENV PHPSUPPORTED="7.2 7.3 8.0 8.1"
+ENV APTINSTALL="apt install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
 RUN apt update && apt install -y \
   acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
   libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
@@ -42,8 +44,21 @@ RUN apt update && \
 # Install needed global PHP modules
 RUN composer -n require justinrainbow/json-schema
 
+# Install other PHP versions
+RUN add-apt-repository ppa:ondrej/php -y && apt update && \
+    PACKAGES=$(dpkg-query -f '${binary:Package}\n' -W|grep "^php.*-") && \
+    for VERSION in $PHPSUPPORTED; do \
+        $APTINSTALL php${VERSION} && \
+        for PACKAGE in $PACKAGES; do \
+            $APTINSTALL php${VERSION}-${PACKAGE#php*-}; \
+        done; \
+    done && update-alternatives --set php /usr/bin/php7.4
+
 # Enable pcov (code coverage) in PHP
 COPY php-config/30-pcov.ini /etc/php/7.4/cli/conf.d/
+RUN for version in $PHPSUPPORTED; do \
+        cp /etc/php/7.4/cli/conf.d/30-pcov.ini /etc/php/${version}/cli/conf.d/; \
+    done
 
 # Put the gitlab user in sudo
 RUN echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
@@ -55,4 +70,4 @@ RUN groupadd domjudge-run
 
 # Do some extra setup
 RUN mkdir -p /run/php \
- && rm /etc/php/7.4/fpm/pool.d/www.conf
+ && rm /etc/php/*/fpm/pool.d/www.conf