From 262de9682b70bf57ab0704fc59e747bb8d84afb3 Mon Sep 17 00:00:00 2001 From: Shady Ibraheem Date: Wed, 18 Dec 2019 18:00:44 -0500 Subject: [PATCH] Revert "Merge pull request #121 from Lctrs/php_7_4" This reverts commit 0e66e9eca180d4d1dccede25e89ff31957b23f87, reversing changes made to b71c9e4e7c3eaa0f4e7abb55fbc679ea58063a61. --- images/linux/scripts/installers/1604/php.sh | 50 ++++----------------- images/linux/scripts/installers/1804/php.sh | 48 +++----------------- 2 files changed, 14 insertions(+), 84 deletions(-) diff --git a/images/linux/scripts/installers/1604/php.sh b/images/linux/scripts/installers/1604/php.sh index fd5961da0..45c5fe039 100644 --- a/images/linux/scripts/installers/1604/php.sh +++ b/images/linux/scripts/installers/1604/php.sh @@ -17,6 +17,7 @@ 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 \ @@ -58,6 +59,7 @@ 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 \ @@ -99,6 +101,7 @@ 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 \ @@ -140,6 +143,8 @@ 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 \ @@ -179,6 +184,8 @@ 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 \ @@ -215,47 +222,7 @@ 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 \ @@ -283,7 +250,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 php7.4 composer phpunit; do +for cmd in php php5.6 php7.0 php7.1 php7.2 php7.3 composer phpunit; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -297,6 +264,5 @@ 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 c6ef6c6ec..7dc872eed 100644 --- a/images/linux/scripts/installers/1804/php.sh +++ b/images/linux/scripts/installers/1804/php.sh @@ -16,6 +16,7 @@ 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 \ @@ -57,6 +58,8 @@ 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 \ @@ -96,6 +99,8 @@ 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 \ @@ -132,47 +137,7 @@ 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 \ @@ -200,7 +165,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 php7.4 composer phpunit; do +for cmd in php php7.1 php7.2 php7.3 composer phpunit; do if ! command -v $cmd; then echo "$cmd was not installed" exit 1 @@ -212,6 +177,5 @@ 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))"