diff --git a/examples/php/.lando.yml b/examples/php/.lando.yml index 57aaf9e5e..a216b7a1e 100644 --- a/examples/php/.lando.yml +++ b/examples/php/.lando.yml @@ -11,28 +11,6 @@ services: cliold: type: php:5.6 via: cli - cli74: - type: php:7.4 - via: cli - custom74: - type: php:7.4 - via: nginx - ssl: true - xdebug: true - webroot: web - config: - php: config/php.ini - overrides: - image: devwithlando/php:7.4-fpm-2 - environment: - DUALBLADE: maxim - custom74_apache: - type: php:7.4 - via: apache - overrides: - image: devwithlando/php:7.4-apache-2 - environment: - DUALBLADE: maxim custom: type: php:7.1 via: nginx @@ -45,6 +23,8 @@ services: image: devwithlando/php:7.1-fpm-2 environment: DUALBLADE: maxim + custom74: + type: php:7.4 composer: type: php:7.0 composer: diff --git a/examples/php/README.md b/examples/php/README.md index d187d1e66..0bd2ed3bc 100644 --- a/examples/php/README.md +++ b/examples/php/README.md @@ -47,9 +47,6 @@ lando ssh -s defaults -c "php -i | grep memory_limit | grep -e \"-1\"" # Should not enable xdebug by default lando ssh -s defaults -c "php -m | grep xdebug" || echo $? | grep 1 -# Should use specified php version if given -lando ssh -s cli74 -c "php -v" | grep "PHP 7.4" - # Should use specified php version if given lando ssh -s custom -c "php -v" | grep "PHP 7.1" @@ -65,23 +62,6 @@ lando ssh -s custom -c "php -m | grep xdebug" # Should not serve port 80 for cli lando ssh -s cli -c "curl http://localhost" || echo $? | grep 1 -# Should use custom php ini if specified -lando ssh -s custom74 -c "php -i | grep memory_limit | grep 514" -lando ssh -s custom74 -c "curl http://custom_nginx" | grep html_errors | grep On | grep On - -# Should inherit overrides from its generator -lando ssh -s custom74 -c "env | grep DUALBLADE | grep maxim" -lando ssh -s custom74_nginx -c "env | grep DUALBLADE | grep maxim" - -# Should enable xdebug if specified -lando ssh -s custom74 -c "php -m | grep xdebug" || echo $? | grep 1 - -# Should serve via nginx if specified -lando ssh -s custom74_nginx -c "curl http://localhost | grep WEBDIR" - -# Should serve via apache if specified -lando ssh -s custom74_apache -c "curl http://localhost | grep ROOTDIR" - # Should use custom php ini if specified lando ssh -s custom -c "php -i | grep memory_limit | grep 514" lando ssh -s custom -c "curl http://custom_nginx" | grep html_errors | grep On | grep On