php: add versions and deprecate hhvm

php/README.md

@@ -17,6 +17,11 @@ Currently, php supported versions are:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
+- 8.0
+- 8.1
+- 8.2
+- 8.3
 
 ## Front ends
 
@@ -58,7 +63,6 @@ php:
 The following PHP interpretors are supported:
 
 - `fpm`: PHP-FPM
-- `hhvm`: HipHop Virtual Machine
 
 You can chose between them by setting the `php.interpretor.name` parameter:
 ```yml
@@ -87,10 +91,6 @@ php:
 - `ini_file`: The relative path of your `php.ini` file in your project, that will replace the default one
 - `extensions`: A list of php extensions you need
 
-## `hhvm` options
-
-- `ini_file`: The relative path of your `php.ini` file in your project, that will replace the default one
-
 ## General options
 
 In addition to the `frontend` and `interpretor` options, there's an other one:

php/install

@@ -9,14 +9,11 @@ SOURCE_DIR=/var/lib/tsuru
 source ${SOURCE_DIR}/base/rc/config
 source ${SOURCE_DIR}/base/rc/os_dependencies
 
-PHP_VERSIONS="5.6 7.0 7.1 7.2"
+PHP_VERSIONS="5.6 7.0 7.1 7.2 8.0 8.1 8.2 8.3"
 
 add_repository ppa:ondrej/php
-hhvm_repo="deb http://dl.hhvm.com/ubuntu ${UBUNTU_RELEASE} main"
-curl -fsSL https://dl.hhvm.com/conf/hhvm.gpg.key | apt-key add -
-add_repository "${hhvm_repo}"
 
-packages=("nginx-core" "hhvm" "python" "python-yaml" "git" "apache2")
+packages=("nginx-core" "python3" "python3-yaml" "git" "apache2")
 for version in $PHP_VERSIONS
 do
     packages+=("php${version}" "php${version}-fpm" "libapache2-mod-php${version}")

php/interpretor.py

@@ -167,5 +167,4 @@ def get_startup_cmd(self, version):
     'fpm': FPM,
     'fpm54': FPM,
     'fpm55': FPM,
-    'hhvm': HHVM
 }

tests/run.sh

@@ -25,9 +25,9 @@ function run_test {
     sed "s/{PLATFORM}/$plat/g" Dockerfile.template > ./$plat/Dockerfile
     cp -r common ./$plat/common
     if [ -z ${NO_REBUILD} ]; then
-        ${DOCKER} build  -t platform-$plat ../$plat && ${DOCKER} build --progress plain -t tests-$plat --no-cache ./$plat
+        ${DOCKER} build --platform linux/amd64 -t platform-$plat ../$plat && ${DOCKER} build --progress plain -t tests-$plat --no-cache ./$plat
     else
-        ${DOCKER} build --progress plain -t tests-$plat --no-cache ./$plat
+        ${DOCKER} build --platform linux/amd64 --progress plain -t tests-$plat --no-cache ./$plat
     fi
     rm ./$plat/Dockerfile && rm -rf ./$plat/common
 }