diff --git a/composer.json b/composer.json index c9ea885..1a968ec 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ }, "require-dev": { "fakerphp/faker": "^v1.21.0", - "laravel/sail": "^v1.18.0", "mockery/mockery": "^1.5.1", "nunomaduro/collision": "^v6.4.0", "phpunit/phpunit": "^9.5.28", diff --git a/composer.lock b/composer.lock index c9d9829..df60738 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "442caac49df4a78107b6a414feae1d65", + "content-hash": "6c4e78d3a11b9e63ea943fb62fe9aaff", "packages": [ { "name": "bacon/bacon-qr-code", @@ -7000,66 +7000,6 @@ }, "time": "2020-07-09T08:09:16+00:00" }, - { - "name": "laravel/sail", - "version": "v1.18.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/sail.git", - "reference": "77feb38df1cf8700c19487957dfb12087cd696c7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/77feb38df1cf8700c19487957dfb12087cd696c7", - "reference": "77feb38df1cf8700c19487957dfb12087cd696c7", - "shasum": "" - }, - "require": { - "illuminate/console": "^8.0|^9.0|^10.0", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", - "php": "^7.3|^8.0" - }, - "bin": [ - "bin/sail" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Sail\\SailServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Laravel\\Sail\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Docker files for running a basic Laravel application.", - "keywords": [ - "docker", - "laravel" - ], - "support": { - "issues": "https://github.com/laravel/sail/issues", - "source": "https://github.com/laravel/sail" - }, - "time": "2023-01-10T16:14:21+00:00" - }, { "name": "mockery/mockery", "version": "1.5.1", diff --git a/documentation/INSTALL.md b/documentation/INSTALL.md index 45d1fef..db86417 100644 --- a/documentation/INSTALL.md +++ b/documentation/INSTALL.md @@ -28,7 +28,7 @@ although this application will run on other GNU/Linux distributions if the depen Ubuntu Server 22.04 or greater is needed because of the PHP >= 8.1 dependency (although it can be used on former Ubuntu Server versions with alternative repositories). -By default, on the Ubuntu 22.04 repository, php defaults to PHP 8.1. On any greater version, replace references of +By default, on the Ubuntu 22.04 repository, PHP defaults to PHP 8.1. On any greater version, replace references of php8.1 or similar to the next PHP version. Any previous version of Ubuntu Server (or any GNU/Linux distribution) may be used, as long as it provides PHP 8.1 (or @@ -70,7 +70,7 @@ FLUSH ```shell exit #leave mariadb shell -apt install php8.1 nginx php8.1-mysql php8.1-fpm php8.1-mbstring php8.1-xml php8.1-bcmath php8.1-curl php8.1-gd php8.1-ldap php8.1-zip git build-essential +apt install php8.1 nginx php8.1-mysql php8.1-fpm php8.1-mbstring php8.1-xml php8.1-bcmath php8.1-curl php8.1-gd php8.1-ldap php8.1-zip git build-essential unzip systemctl enable nginx php8.1-fpm.service ufw enable ufw allow "OpenSSH" @@ -246,8 +246,6 @@ git clone https://github.com/daviddmd/assetriskmanager cd assetriskmanager cp .env.example .env composer install #or php composer.phar install -npm install -npm run dev php artisan key:generate ``` @@ -312,6 +310,10 @@ The following instructions will vary depending on if you want to install the app ## With Docker +Laravel makes use of Laravel Sail to create a containerized environment for Laravel development. If on Windows, WSL2 +must be the Docker backend. A significant performance impact is expected due to the filesystem translation between Linux +and Windows since the Sail dockerfile uses a bind mount to serve the application files to the application container. + Backup `docker-compose.yml` to `docker-compose-mysql.yml`. In `.env` edit the following variables to your preference: @@ -327,10 +329,12 @@ DB_PASSWORD=password Next, run: ``` +composer require laravel/sail --dev php artisan sail:install bash ./vendor/laravel/sail/bin/sail up bash ./vendor/laravel/sail/bin/sail artisan migrate bash ./vendor/laravel/sail/bin/sail artisan db:seed +bash ./vendor/laravel/sail/bin/sail npm run dev ``` The platform will be accessible at `http://localhost`.