Composer2 can be installed again in our images

Author: vmcj

.github/jobs/baseinstall.sh

@@ -26,7 +26,7 @@ sudo apt update
 section_end
 
 section_start "Install needed packages"
-sudo apt install -y acl zip unzip nginx php php-fpm php-gd \
+sudo apt install -y acl zip unzip nginx composer php php-fpm php-gd \
                     php-cli php-intl php-mbstring php-mysql php-curl php-json \
                     php-xml php-zip ntp make sudo debootstrap \
                     libcgroup-dev lsof php-cli php-curl php-json php-xml \
@@ -39,13 +39,6 @@ section_end
 PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
 export PHPVERSION
 
-section_start "Install composer"
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-HASH="$(wget -q -O - https://composer.github.io/installer.sig)"
-php -r "if (hash_file('SHA384', 'composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
-section_end
-
 section_start "Run composer"
 export APP_ENV="dev"
 composer install --no-scripts

.github/workflows/codeql-analysis.yml

@@ -41,18 +41,14 @@ jobs:
       if: ${{ contains(env.COMPILED, matrix.language) }}
       run: |
         sudo apt update
-        sudo apt install -y acl zip unzip apache2 php php-fpm php-gd \
+        sudo apt install -y acl zip unzip apache2 composer php php-fpm php-gd \
                             php-cli php-intl php-mbstring php-mysql php-curl php-json \
                             php-xml php-zip ntp make sudo debootstrap \
                             libcgroup-dev lsof php-cli php-curl php-json php-xml \
                             php-zip procps gcc g++ default-jre-headless \
                             default-jdk-headless ghc fp-compiler autoconf automake bats \
                             python3-sphinx python3-sphinx-rtd-theme rst2pdf fontconfig \
                             python3-yaml latexmk
-        php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-        HASH="$(wget -q -O - https://composer.github.io/installer.sig)"
-        php -r "if (hash_file('SHA384', 'composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-        sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 
     - name: Install composer files
       if: ${{ contains(env.COMPILED, matrix.language) }}