diff --git a/README.md b/README.md index e54c5fe..b8b228f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

## Built with -- [Laravel 9](https://github.com/laravel/framework) +- [Laravel 10](https://github.com/laravel/framework) - [spatie/laravel-permission](https://github.com/spatie/laravel-permission) - [Laravel Breeze](https://github.com/laravel/breeze) - [balajidharma/laravel-menu](https://github.com/balajidharma/laravel-menu) @@ -20,9 +20,9 @@ - To get started, you need to install [Docker Desktop](https://www.docker.com/products/docker-desktop). - You may run the following command in your terminal - Windows open WSL2 Linux terminal. [Docker Desktop WSL 2 backend](https://docs.docker.com/desktop/windows/wsl/) -- `docker run --rm -v "$(pwd)":/opt -w /opt laravelsail/php81-composer:latest bash -c "composer create-project balajidharma/laravel-vue-admin-panel admin-app && cd admin-app && php artisan sail:install --with=mysql,redis,meilisearch,mailhog,selenium"` +- `docker run --rm -v "$(pwd)":/opt -w /opt laravelsail/php82-composer:latest bash -c "composer create-project balajidharma/laravel-vue-admin-panel admin-app && cd admin-app && php artisan sail:install --with=mysql,redis,meilisearch,mailpit,selenium"` - `cd admin-app` -- `./vendor/bin/sail pull mysql redis meilisearch mailhog selenium` +- `./vendor/bin/sail pull mysql redis meilisearch mailpit selenium` - `./vendor/bin/sail build` - `./vendor/bin/sail up` - `./vendor/bin/sail npm install` diff --git a/composer.json b/composer.json index 0552850..077d0fb 100644 --- a/composer.json +++ b/composer.json @@ -5,13 +5,13 @@ "keywords": ["framework", "laravel", "boilerplate", "admin panel"], "license": "MIT", "require": { - "php": "^8.0.2", + "php": "^8.1", "balajidharma/laravel-admin-core": "^1.0", "guzzlehttp/guzzle": "^7.2", - "inertiajs/inertia-laravel": "^0.5.4", - "laravel/framework": "^9.19", - "laravel/sanctum": "^2.8", - "laravel/tinker": "^2.7", + "inertiajs/inertia-laravel": "^0.6", + "laravel/framework": "^10.0", + "laravel/sanctum": "^3.2", + "laravel/tinker": "^2.8", "spatie/laravel-permission": "^5.5", "tightenco/ziggy": "^1.0" }, @@ -19,11 +19,11 @@ "fakerphp/faker": "^1.9.1", "laravel/breeze": "^1.10", "laravel/pint": "^1.0", - "laravel/sail": "^1.0.1", + "laravel/sail": "^1.18", "mockery/mockery": "^1.4.4", - "nunomaduro/collision": "^6.1", - "phpunit/phpunit": "^9.5.10", - "spatie/laravel-ignition": "^1.0" + "nunomaduro/collision": "^7.0", + "phpunit/phpunit": "^10.0", + "spatie/laravel-ignition": "^2.0" }, "autoload": { "psr-4": { @@ -60,8 +60,11 @@ "config": { "optimize-autoloader": true, "preferred-install": "dist", - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "pestphp/pest-plugin": true + } }, - "minimum-stability": "dev", + "minimum-stability": "stable", "prefer-stable": true } diff --git a/docker-compose.yml b/docker-compose.yml index 502f1e3..ae249a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ version: '3' services: laravel.test: build: - context: ./vendor/laravel/sail/runtimes/8.1 + context: ./vendor/laravel/sail/runtimes/8.2 dockerfile: Dockerfile args: WWWGROUP: '${WWWGROUP}' - image: sail-8.1/app + image: sail-8.2/app extra_hosts: - 'host.docker.internal:host-gateway' ports: @@ -26,6 +26,7 @@ services: - mysql - redis - meilisearch + - mailpit - selenium mysql: image: 'mysql/mysql-server:8.0' @@ -44,7 +45,11 @@ services: networks: - sail healthcheck: - test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"] + test: + - CMD + - mysqladmin + - ping + - '-p${DB_PASSWORD}' retries: 3 timeout: 5s redis: @@ -56,7 +61,10 @@ services: networks: - sail healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: + - CMD + - redis-cli + - ping retries: 3 timeout: 5s meilisearch: @@ -68,18 +76,25 @@ services: networks: - sail healthcheck: - test: ["CMD", "wget", "--no-verbose", "--spider", "http://localhost:7700/health"] + test: + - CMD + - wget + - '--no-verbose' + - '--spider' + - 'http://localhost:7700/health' retries: 3 timeout: 5s - mailhog: - image: 'mailhog/mailhog:latest' + mailpit: + image: 'axllent/mailpit:latest' ports: - - '${FORWARD_MAILHOG_PORT:-1025}:1025' - - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025' + - '${FORWARD_MAILPIT_PORT:-1025}:1025' + - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' networks: - sail selenium: image: 'selenium/standalone-chrome' + extra_hosts: + - 'host.docker.internal:host-gateway' volumes: - '/dev/shm:/dev/shm' networks: