From a895748980b3e055ffcb68b6bc1c2e5fad6ecb08 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Dec 2020 09:04:09 -0600 Subject: [PATCH 01/10] update env file for sail --- .env.example | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 7dc51e1f..c0502795 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,8 @@ LOG_CHANNEL=stack LOG_LEVEL=debug DB_CONNECTION=mysql -DB_HOST=127.0.0.1 +# DB_HOST=127.0.0.1 +DB_HOST=mysql DB_PORT=3306 DB_DATABASE=laravel DB_USERNAME=root @@ -16,17 +17,21 @@ DB_PASSWORD= BROADCAST_DRIVER=log CACHE_DRIVER=file -QUEUE_CONNECTION=sync +QUEUE_CONNECTION=database SESSION_DRIVER=file SESSION_LIFETIME=120 -REDIS_HOST=127.0.0.1 +# MEMCACHED_HOST=127.0.0.1 +MEMCACHED_HOST=memcached + +# REDIS_HOST=127.0.0.1 +REDIS_HOST=redis REDIS_PASSWORD=null REDIS_PORT=6379 MAIL_MAILER=smtp -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 +MAIL_HOST=mailhog +MAIL_PORT=1025 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null From bcd87e80ac7fa6a5daf0e549059ad7cb0b41ce75 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Dec 2020 09:38:54 -0600 Subject: [PATCH 02/10] add sail file --- docker-compose.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..089e4856 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,74 @@ +# For more information: https://laravel.com/docs/sail +version: '3' +services: + laravel.test: + build: + context: ./vendor/laravel/sail/runtimes/8.0 + dockerfile: Dockerfile + args: + WWWGROUP: '${WWWGROUP}' + image: sail-8.0/app + ports: + - '${APP_PORT:-80}:80' + environment: + WWWUSER: '${WWWUSER}' + LARAVEL_SAIL: 1 + volumes: + - '.:/var/www/html' + networks: + - sail + depends_on: + - mysql + - redis + # - selenium + # selenium: + # image: 'selenium/standalone-chrome' + # volumes: + # - '/dev/shm:/dev/shm' + # networks: + # - sail + # depends_on: + # - laravel.test + mysql: + image: 'mysql:8.0' + ports: + - '${DB_PORT}:3306' + environment: + MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' + MYSQL_DATABASE: '${DB_DATABASE}' + MYSQL_USER: '${DB_USERNAME}' + MYSQL_PASSWORD: '${DB_PASSWORD}' + MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' + volumes: + - 'sailmysql:/var/lib/mysql' + networks: + - sail + redis: + image: 'redis:alpine' + ports: + - '${REDIS_PORT}:6379' + volumes: + - 'sailredis:/data' + networks: + - sail + # memcached: + # image: 'memcached:alpine' + # ports: + # - '11211:11211' + # networks: + # - sail + mailhog: + image: 'mailhog/mailhog:latest' + ports: + - 1025:1025 + - 8025:8025 + networks: + - sail +networks: + sail: + driver: bridge +volumes: + sailmysql: + driver: local + sailredis: + driver: local From 34368a4fab61839c106efb1eea087cc270639619 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Dec 2020 09:45:05 -0600 Subject: [PATCH 03/10] revert change --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index c0502795..68c9578c 100644 --- a/.env.example +++ b/.env.example @@ -17,7 +17,7 @@ DB_PASSWORD= BROADCAST_DRIVER=log CACHE_DRIVER=file -QUEUE_CONNECTION=database +QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 From 17668beabe4cb489ad07abb8af0a9da01860601e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Dec 2020 09:51:48 -0600 Subject: [PATCH 04/10] add sail --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 9d06962b..2bc6bbe7 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "require-dev": { "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", + "laravel/sail": "^0.0.5", "mockery/mockery": "^1.4.2", "nunomaduro/collision": "^5.0", "phpunit/phpunit": "^9.3.3" From d80ff4d576eb4f47369e1f8481d3da8a9479347b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 9 Dec 2020 08:32:27 -0600 Subject: [PATCH 05/10] add sponsor --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2f7ddcc6..e1dcd2e1 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel - **[Many](https://www.many.co.uk)** - **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** - **[DevSquad](https://devsquad.com)** +- **[Curotec](https://www.curotec.com/)** - **[OP.GG](https://op.gg)** ## Contributing From b7cde8b495e183f386da63ff7792e0dea9cfcf56 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 10 Dec 2020 07:14:14 -0600 Subject: [PATCH 06/10] comment trust hosts --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 21a8754b..30020a50 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,7 +14,7 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \App\Http\Middleware\TrustHosts::class, + // \App\Http\Middleware\TrustHosts::class, \App\Http\Middleware\TrustProxies::class, \Fruitcake\Cors\HandleCors::class, \App\Http\Middleware\PreventRequestsDuringMaintenance::class, From 03ecf00f7a4e14c049e41bb111430877313449b9 Mon Sep 17 00:00:00 2001 From: Attila Szeremi Date: Thu, 10 Dec 2020 14:32:49 +0100 Subject: [PATCH 07/10] Gitignore docker-compose.override.yml (#5487) Docker allows for you to override parts of `docker-compose.yml` locally with the help of a `docker-compose.override.yml` file: https://docs.docker.com/compose/extends/#understanding-multiple-compose-files I propose to have this file ignored by default for new projects, similarly to how `.env` is ignored to be able to override default configuration (locally). Example use case: Someone might want to use Laravel Sail, but would have multiple Laravel projects running in MySQL and would like to run a single MySQL server for each project and have a way to be able to override docker-compose to make that happen. Or maybe just in general they want to add a new service that they want to run only for themselves, and not for colleagues. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0f7df0fb..0ae59f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .env .env.backup .phpunit.result.cache +docker-compose.override.yml Homestead.json Homestead.yaml npm-debug.log From ddb26fbc504cd64fb1b89511773aa8d03c758c6d Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 10 Dec 2020 09:26:21 -0600 Subject: [PATCH 08/10] update env vars --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 089e4856..5ba8e628 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: mysql: image: 'mysql:8.0' ports: - - '${DB_PORT}:3306' + - '${FORWARD_DB_PORT:-3306}:3306' environment: MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' MYSQL_DATABASE: '${DB_DATABASE}' @@ -46,7 +46,7 @@ services: redis: image: 'redis:alpine' ports: - - '${REDIS_PORT}:6379' + - '${FORWARD_REDIS_PORT:-6379}:6379' volumes: - 'sailredis:/data' networks: From 3b2ed46e65c603ddc682753f1a9bb5472c4e12a8 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 12 Dec 2020 08:47:22 -0600 Subject: [PATCH 09/10] update variables --- .env.example | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 68c9578c..c3ed2a91 100644 --- a/.env.example +++ b/.env.example @@ -8,8 +8,7 @@ LOG_CHANNEL=stack LOG_LEVEL=debug DB_CONNECTION=mysql -# DB_HOST=127.0.0.1 -DB_HOST=mysql +DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=laravel DB_USERNAME=root @@ -21,11 +20,9 @@ QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 -# MEMCACHED_HOST=127.0.0.1 -MEMCACHED_HOST=memcached +MEMCACHED_HOST=127.0.0.1 -# REDIS_HOST=127.0.0.1 -REDIS_HOST=redis +REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 From 0059fb91be7725c47ae2a6aa10d4f34ee5340c89 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 15 Dec 2020 14:17:57 +0100 Subject: [PATCH 10/10] Update CHANGELOG.md --- CHANGELOG.md | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 195610f2..58366dbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,46 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.4...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.5...8.x) + + +## [v8.5.5 (2020-12-12)](https://github.com/laravel/laravel/compare/v8.5.4...v8.5.5) + +### Changed +- Revert changes to env file ([3b2ed46](https://github.com/laravel/laravel/commit/3b2ed46e65c603ddc682753f1a9bb5472c4e12a8)) + + +## [v8.5.4 (2020-12-10)](https://github.com/laravel/laravel/compare/v8.5.3...v8.5.4) + +### Changed +- Gitignore `docker-compose.override.yml` ([#5487](https://github.com/laravel/laravel/pull/5487) +- Update ENV vars to docker file ([ddb26fb](https://github.com/laravel/laravel/commit/ddb26fbc504cd64fb1b89511773aa8d03c758c6d)) + + +## [v8.5.3 (2020-12-10)](https://github.com/laravel/laravel/compare/v8.5.2...v8.5.3) + +### Changed +- Disable `TrustHosts` middleware ([b7cde8b](https://github.com/laravel/laravel/commit/b7cde8b495e183f386da63ff7792e0dea9cfcf56)) + + +## [v8.5.2 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.5.1...v8.5.2) + +### Added +- Add Sail ([17668be](https://github.com/laravel/laravel/commit/17668beabe4cb489ad07abb8af0a9da01860601e)) + + +## [v8.5.1 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.5.0...v8.5.1) + +### Changed +- Revert change to `QUEUE_CONNECTION` ([34368a4](https://github.com/laravel/laravel/commit/34368a4fab61839c106efb1eea087cc270639619)) + + +## [v8.5.0 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.4.4...v8.5.0) + +### Added +- Add Sail file ([bcd87e8](https://github.com/laravel/laravel/commit/bcd87e80ac7fa6a5daf0e549059ad7cb0b41ce75)) + +### Changed +- Update env file for Sail ([a895748](https://github.com/laravel/laravel/commit/a895748980b3e055ffcb68b6bc1c2e5fad6ecb08)) ## [v8.4.4 (2020-12-01)](https://github.com/laravel/laravel/compare/v8.4.3...v8.4.4)