diff --git a/CHANGELOG.md b/CHANGELOG.md index 765b11d3..86ba5d17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/sail/compare/v1.18.0...1.x) +## [Unreleased](https://github.com/laravel/sail/compare/v1.18.1...1.x) + +## [v1.18.1](https://github.com/laravel/sail/compare/v1.18.0...v1.18.1) - 2023-01-12 + +### Changed + +- Update devcontainer stub (vscode customizations) by @mojgit in https://github.com/laravel/sail/pull/528 ## [v1.18.0](https://github.com/laravel/sail/compare/v1.17.0...v1.18.0) - 2023-01-10 diff --git a/bin/sail b/bin/sail index 1863cfc9..e764c51e 100755 --- a/bin/sail +++ b/bin/sail @@ -82,6 +82,7 @@ function display_help { echo "${YELLOW}Running Tests:${NC}" echo " ${GREEN}sail test${NC} Run the PHPUnit tests via the Artisan test command" echo " ${GREEN}sail phpunit ...${NC} Run PHPUnit" + echo " ${GREEN}sail pest ...${NC} Run Pest" echo " ${GREEN}sail pint ...${NC} Run Pint" echo " ${GREEN}sail dusk${NC} Run the Dusk tests (Requires the laravel/dusk package)" echo " ${GREEN}sail dusk:fails${NC} Re-run previously failed Dusk tests (Requires the laravel/dusk package)" @@ -134,6 +135,7 @@ export SAIL_SHARE_DASHBOARD=${SAIL_SHARE_DASHBOARD:-4040} export SAIL_SHARE_SERVER_HOST=${SAIL_SHARE_SERVER_HOST:-"laravel-sail.site"} export SAIL_SHARE_SERVER_PORT=${SAIL_SHARE_SERVER_PORT:-8080} export SAIL_SHARE_SUBDOMAIN=${SAIL_SHARE_SUBDOMAIN:-""} +export SAIL_SHARE_DOMAIN=${SAIL_SHARE_DOMAIN:-""} # Function that outputs Sail is not running... function sail_is_not_running { @@ -287,6 +289,18 @@ elif [ "$1" == "phpunit" ]; then sail_is_not_running fi +# Proxy the "pest" command to "php vendor/bin/pest"... +elif [ "$1" == "pest" ]; then + shift 1 + + if [ "$EXEC" == "yes" ]; then + ARGS+=(exec -u sail) + [ ! -t 0 ] && ARGS+=(-T) + ARGS+=("$APP_SERVICE" php vendor/bin/pest "$@") + else + sail_is_not_running + fi + # Proxy the "pint" command to "php vendor/bin/pint"... elif [ "$1" == "pint" ]; then shift 1 @@ -472,6 +486,7 @@ elif [ "$1" == "share" ]; then --server-port="$SAIL_SHARE_SERVER_PORT" \ --auth="$SAIL_SHARE_TOKEN" \ --subdomain="$SAIL_SHARE_SUBDOMAIN" \ + --domain="$SAIL_SHARE_DOMAIN" \ "$@" exit diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 2638c447..eefb0ffc 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -37,7 +37,7 @@ class InstallCommand extends Command 'memcached', 'meilisearch', 'minio', - 'mailhog', + 'mailpit', 'selenium', ]; @@ -51,7 +51,7 @@ public function handle() if ($this->option('with')) { $services = $this->option('with') == 'none' ? [] : explode(',', $this->option('with')); } elseif ($this->option('no-interaction')) { - $services = ['mysql', 'redis', 'selenium', 'mailhog']; + $services = ['mysql', 'redis', 'selenium', 'mailpit']; } else { $services = $this->gatherServicesWithSymfonyMenu(); } diff --git a/stubs/mailhog.stub b/stubs/mailhog.stub deleted file mode 100644 index ebbf5591..00000000 --- a/stubs/mailhog.stub +++ /dev/null @@ -1,7 +0,0 @@ - mailhog: - image: 'mailhog/mailhog:latest' - ports: - - '${FORWARD_MAILHOG_PORT:-1025}:1025' - - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025' - networks: - - sail diff --git a/stubs/mailpit.stub b/stubs/mailpit.stub new file mode 100644 index 00000000..8aa62b94 --- /dev/null +++ b/stubs/mailpit.stub @@ -0,0 +1,7 @@ + mailpit: + image: 'axllent/mailpit:latest' + ports: + - '${FORWARD_MAILPIT_PORT:-1025}:1025' + - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' + networks: + - sail