diff --git a/bin/homestead b/bin/homestead index 5ef2fe70d..8e5993b33 100755 --- a/bin/homestead +++ b/bin/homestead @@ -8,7 +8,7 @@ if(is_file( __DIR__.'/../vendor/autoload.php')) { require __DIR__.'/../../../autoload.php'; } -$app = new Symfony\Component\Console\Application('Laravel Homestead', '12.8.0'); +$app = new Symfony\Component\Console\Application('Laravel Homestead', '13.0.0'); $app->add(new Laravel\Homestead\MakeCommand); $app->add(new Laravel\Homestead\WslApplyFeatures); diff --git a/resources/aliases b/resources/aliases index d26ec82d4..5568dc589 100644 --- a/resources/aliases +++ b/resources/aliases @@ -112,7 +112,7 @@ function serve-apache() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/apache.sh - sudo bash /vagrant/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -125,7 +125,7 @@ function serve-laravel() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/laravel.sh - sudo bash /vagrant/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -137,7 +137,7 @@ function serve-proxy() { if [[ "$1" && "$2" ]] then sudo dos2unix /vagrant/scripts/site-types/proxy.sh - sudo bash /vagrant/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -150,7 +150,7 @@ function serve-silverstripe() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/silverstripe.sh - sudo bash /vagrant/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -163,7 +163,7 @@ function serve-spa() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/spa.sh - sudo bash /vagrant/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -176,7 +176,7 @@ function serve-statamic() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/statamic.sh - sudo bash /vagrant/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -189,7 +189,7 @@ function serve-symfony2() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/symfony2.sh - sudo bash /vagrant/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -202,7 +202,7 @@ function serve-symfony4() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/symfony4.sh - sudo bash /vagrant/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -215,7 +215,7 @@ function serve-pimcore() { then sudo bash /vagrant/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/scripts/site-types/pimcore.sh - sudo bash /vagrant/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " diff --git a/resources/localized/aliases b/resources/localized/aliases index 20383ee1e..711769f7c 100644 --- a/resources/localized/aliases +++ b/resources/localized/aliases @@ -7,7 +7,6 @@ alias art=artisan alias codecept='vendor/bin/codecept' alias phpspec='vendor/bin/phpspec' -alias phpunit='vendor/bin/phpunit' alias serve=serve-laravel alias xoff='sudo phpdismod -s cli xdebug' @@ -24,9 +23,30 @@ function dusk() { Xvfb :0 -screen 0 1280x960x24 & fi - php artisan dusk --filter "$@" + if [[ $? -eq 0 ]] + then + php artisan dusk + else + php artisan dusk --filter "$@" + fi } +function p() { + if [ -f vendor/bin/pest ]; then + vendor/bin/pest "$@" + else + vendor/bin/phpunit "$@" + fi + } + + function pf() { + if [ -f vendor/bin/pest ]; then + vendor/bin/pest --filter "$@" + else + vendor/bin/phpunit --filter "$@" + fi + } + function php56() { sudo update-alternatives --set php /usr/bin/php5.6 sudo update-alternatives --set php-config /usr/bin/php-config5.6 @@ -80,7 +100,7 @@ function serve-apache() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/apache.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -93,7 +113,7 @@ function serve-laravel() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/laravel.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -105,7 +125,7 @@ function serve-proxy() { if [[ "$1" && "$2" ]] then sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/proxy.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -118,7 +138,7 @@ function serve-silverstripe() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/silverstripe.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -131,7 +151,7 @@ function serve-spa() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/spa.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -144,7 +164,7 @@ function serve-statamic() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/statamic.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -157,7 +177,7 @@ function serve-symfony2() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/symfony2.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -170,7 +190,7 @@ function serve-symfony4() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/symfony4.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " @@ -183,7 +203,7 @@ function serve-pimcore() { then sudo bash /vagrant/vendor/laravel/homestead/scripts/create-certificate.sh "$1" sudo dos2unix /vagrant/vendor/laravel/homestead/scripts/site-types/pimcore.sh - sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-7.4}" + sudo bash /vagrant/vendor/laravel/homestead/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-8.1}" else echo "Error: missing required parameters." echo "Usage: " diff --git a/scripts/features/minio.sh b/scripts/features/minio.sh index 7d691f0f2..ca58e564a 100755 --- a/scripts/features/minio.sh +++ b/scripts/features/minio.sh @@ -16,10 +16,17 @@ then exit 0 fi +ARCH=$(arch) + + touch /home/$WSL_USER_NAME/.homestead-features/minio chown -Rf $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME/.homestead-features -wget https://dl.minio.io/server/minio/release/linux-amd64/minio +if [[ "$ARCH" == "aarch64" ]]; then + curl -sO https://dl.minio.io/server/minio/release/linux-arm64/minio +else + curl -sO https://dl.minio.io/server/minio/release/linux-amd64/minio +fi sudo chmod +x minio sudo mv minio /usr/local/bin @@ -49,7 +56,12 @@ sudo systemctl start minio sudo ufw allow 9600 # Installing Minio Client -curl -sO https://dl.minio.io/client/mc/release/linux-amd64/mc +if [[ "$ARCH" == "aarch64" ]]; then + curl -sO https://dl.minio.io/client/mc/release/linux-arm64/mc +else + curl -sO https://dl.minio.io/client/mc/release/linux-amd64/mc +fi + chmod +x mc sudo mv mc /usr/local/bin mc config host add homestead http://127.0.1.1:9600 homestead secretkey diff --git a/scripts/homestead.rb b/scripts/homestead.rb index ddb3f7c44..e2d74ce30 100644 --- a/scripts/homestead.rb +++ b/scripts/homestead.rb @@ -19,7 +19,7 @@ def self.configure(config, settings) config.vm.define settings['name'] ||= 'homestead' config.vm.box = settings['box'] ||= 'laravel/homestead' unless settings.has_key?('SpeakFriendAndEnter') - config.vm.box_version = settings['version'] ||= '>= 11.0.0, < 12.0.0' + config.vm.box_version = settings['version'] ||= '>= 12.0.0, < 13.0.0' end config.vm.hostname = settings['hostname'] ||= 'homestead' @@ -378,7 +378,7 @@ def self.configure(config, settings) site['to'], # $2 site['port'] ||= http_port, # $3 site['ssl'] ||= https_port, # $4 - site['php'] ||= '8.0', # $5 + site['php'] ||= '8.1', # $5 params ||= '', # $6 site['xhgui'] ||= '', # $7 site['exec'] ||= 'false', # $8 @@ -517,6 +517,11 @@ def self.configure(config, settings) s.args = [var['key'], var['value']] end + config.vm.provision 'shell' do |s| + s.inline = "echo \"\nenv[$1] = '$2'\" >> /etc/php/8.1/fpm/pool.d/www.conf" + s.args = [var['key'], var['value']] + end + config.vm.provision 'shell' do |s| s.inline = "echo \"\n# Set Homestead Environment Variable\nexport $1=$2\" >> /home/vagrant/.profile" s.args = [var['key'], var['value']] @@ -524,7 +529,7 @@ def self.configure(config, settings) end config.vm.provision 'shell' do |s| - s.inline = 'service php5.6-fpm restart;service php7.0-fpm restart;service php7.1-fpm restart; service php7.2-fpm restart; service php7.3-fpm restart; service php7.4-fpm restart; service php8.0-fpm restart;' + s.inline = 'service php5.6-fpm restart;service php7.0-fpm restart;service php7.1-fpm restart; service php7.2-fpm restart; service php7.3-fpm restart; service php7.4-fpm restart; service php8.0-fpm restart; service php8.1-fpm restart;' end end diff --git a/scripts/in-flight-service.sh b/scripts/in-flight-service.sh index 07b47ce28..12b0b5ee6 100644 --- a/scripts/in-flight-service.sh +++ b/scripts/in-flight-service.sh @@ -4,5 +4,5 @@ # Without having to ship an entirely new base box. # Fix expired certs: https://github.com/laravel/homestead/issues/1707 -sudo rm -rf /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt -sudo update-ca-certificates +# sudo rm -rf /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt +# sudo update-ca-certificates