diff --git a/images/linux/scripts/installers/1604/php.sh b/images/linux/scripts/installers/1604/php.sh index 45c5fe039..fd5961da0 100644 --- a/images/linux/scripts/installers/1604/php.sh +++ b/images/linux/scripts/installers/1604/php.sh @@ -17,7 +17,6 @@ apt-add-repository ppa:ondrej/php -y apt-get update apt-fast install -y --no-install-recommends \ php5.6 \ - php5.6-amqp \ php5.6-bcmath \ php5.6-bz2 \ php5.6-cgi \ @@ -59,7 +58,6 @@ apt-get remove --purge -yq php5.6-dev # Install php7.0 apt-fast install -y --no-install-recommends \ php7.0 \ - php7.0-amqp \ php7.0-bcmath \ php7.0-bz2 \ php7.0-cgi \ @@ -101,7 +99,6 @@ apt-get remove --purge -yq php7.0-dev # Install php7.1 apt-fast install -y --no-install-recommends \ php7.1 \ - php7.1-amqp \ php7.1-bcmath \ php7.1-bz2 \ php7.1-cgi \ @@ -143,8 +140,6 @@ apt-get remove --purge -yq php7.1-dev # Install php7.2 apt-fast install -y --no-install-recommends \ php7.2 \ - php7.2-apcu \ - php7.2-amqp \ php7.2-bcmath \ php7.2-bz2 \ php7.2-cgi \ @@ -184,8 +179,6 @@ apt-fast install -y --no-install-recommends \ # Install php7.3 apt-fast install -y --no-install-recommends \ php7.3 \ - php7.3-apcu \ - php7.3-amqp \ php7.3-bcmath \ php7.3-bz2 \ php7.3-cgi \ @@ -222,7 +215,47 @@ apt-fast install -y --no-install-recommends \ php7.3-xsl \ php7.3-zip +# Install php7.4 apt-fast install -y --no-install-recommends \ + php7.4 \ + php7.4-bcmath \ + php7.4-bz2 \ + php7.4-cgi \ + php7.4-cli \ + php7.4-common \ + php7.4-curl \ + php7.4-dba \ + php7.4-dev \ + php7.4-enchant \ + php7.4-fpm \ + php7.4-gd \ + php7.4-gmp \ + php7.4-imap \ + php7.4-interbase \ + php7.4-intl \ + php7.4-json \ + php7.4-ldap \ + php7.4-mbstring \ + php7.4-mysql \ + php7.4-odbc \ + php7.4-opcache \ + php7.4-pgsql \ + php7.4-phpdbg \ + php7.4-pspell \ + php7.4-readline \ + php7.4-snmp \ + php7.4-soap \ + php7.4-sqlite3 \ + php7.4-sybase \ + php7.4-tidy \ + php7.4-xml \ + php7.4-xmlrpc \ + php7.4-xsl \ + php7.4-zip + +apt-fast install -y --no-install-recommends \ + php-amqp \ + php-apcu \ php-igbinary \ php-memcache \ php-memcached \ @@ -250,7 +283,7 @@ mv phpunit /usr/local/bin/phpunit # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in php php5.6 php7.0 php7.1 php7.2 php7.3 composer phpunit; do +for cmd in php php5.6 php7.0 php7.1 php7.2 php7.3 php7.4 composer phpunit; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -264,5 +297,6 @@ DocumentInstalledItem "PHP 7.0 ($(php7.0 --version | head -n 1))" DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))" DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))" DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))" +DocumentInstalledItem "PHP 7.4 ($(php7.4 --version | head -n 1))" DocumentInstalledItem "Composer ($(composer --version))" DocumentInstalledItem "PHPUnit ($(phpunit --version))" diff --git a/images/linux/scripts/installers/1804/php.sh b/images/linux/scripts/installers/1804/php.sh index 7dc872eed..c6ef6c6ec 100644 --- a/images/linux/scripts/installers/1804/php.sh +++ b/images/linux/scripts/installers/1804/php.sh @@ -16,7 +16,6 @@ apt-add-repository ppa:ondrej/php -y # Install php7.1 apt-fast install -y --no-install-recommends \ php7.1 \ - php7.1-amqp \ php7.1-bcmath \ php7.1-bz2 \ php7.1-cgi \ @@ -58,8 +57,6 @@ apt-get remove --purge -yq php7.1-dev # Install php7.2 apt-fast install -y --no-install-recommends \ php7.2 \ - php7.2-apcu \ - php7.2-amqp \ php7.2-bcmath \ php7.2-bz2 \ php7.2-cgi \ @@ -99,8 +96,6 @@ apt-fast install -y --no-install-recommends \ # Install php7.3 apt-fast install -y --no-install-recommends \ php7.3 \ - php7.3-apcu \ - php7.3-amqp \ php7.3-bcmath \ php7.3-bz2 \ php7.3-cgi \ @@ -137,7 +132,47 @@ apt-fast install -y --no-install-recommends \ php7.3-xsl \ php7.3-zip +# Install php7.4 apt-fast install -y --no-install-recommends \ + php7.4 \ + php7.4-bcmath \ + php7.4-bz2 \ + php7.4-cgi \ + php7.4-cli \ + php7.4-common \ + php7.4-curl \ + php7.4-dba \ + php7.4-dev \ + php7.4-enchant \ + php7.4-fpm \ + php7.4-gd \ + php7.4-gmp \ + php7.4-imap \ + php7.4-interbase \ + php7.4-intl \ + php7.4-json \ + php7.4-ldap \ + php7.4-mbstring \ + php7.4-mysql \ + php7.4-odbc \ + php7.4-opcache \ + php7.4-pgsql \ + php7.4-phpdbg \ + php7.4-pspell \ + php7.4-readline \ + php7.4-snmp \ + php7.4-soap \ + php7.4-sqlite3 \ + php7.4-sybase \ + php7.4-tidy \ + php7.4-xml \ + php7.4-xmlrpc \ + php7.4-xsl \ + php7.4-zip + +apt-fast install -y --no-install-recommends \ + php-amqp \ + php-apcu \ php-igbinary \ php-memcache \ php-memcached \ @@ -165,7 +200,7 @@ mv phpunit /usr/local/bin/phpunit # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in php php7.1 php7.2 php7.3 composer phpunit; do +for cmd in php php7.1 php7.2 php7.3 php7.4 composer phpunit; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -177,5 +212,6 @@ echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))" DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))" DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))" +DocumentInstalledItem "PHP 7.4 ($(php7.4 --version | head -n 1))" DocumentInstalledItem "Composer ($(composer --version))" DocumentInstalledItem "PHPUnit ($(phpunit --version))"