Upgrade Sail

Now with Xdebug support!!

.env.example

@@ -52,6 +52,12 @@ QUEUE_CONVERSIONS_BY_DEFAULT=false
 #AWS_DEFAULT_REGION=
 #AWS_BUCKET=
 
+#
+# Sail (local development).
+#
+
+#SAIL_XDEBUG_MODE=develop,debug
+
 #
 # Misc. drivers and configuration.
 #

composer.json

@@ -35,7 +35,7 @@
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
         "laravel/breeze": "^1.0",
-        "laravel/sail": "^0.0.5",
+        "laravel/sail": "^1.10",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
         "nunomaduro/larastan": "^0.6.13",

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": "120e3fc90df7558d98551448b10475d0",
+    "content-hash": "d439d0b8ef963ec97130782e7092153d",
     "packages": [
         {
             "name": "algolia/algoliasearch-client-php",
@@ -9506,19 +9506,20 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v0.0.5",
+            "version": "v1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "d9b0575ece889a35b9741789452c1c7abca5bc2f"
+                "reference": "267fafeaf0e0311952316ae0f3c765abc7516469"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/d9b0575ece889a35b9741789452c1c7abca5bc2f",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/267fafeaf0e0311952316ae0f3c765abc7516469",
-                "reference": "d9b0575ece889a35b9741789452c1c7abca5bc2f",
+                "reference": "267fafeaf0e0311952316ae0f3c765abc7516469",
                 "shasum": ""
             },
             "require": {
+                "illuminate/console": "^8.0|^9.0",
                 "illuminate/contracts": "^8.0|^9.0",
                 "illuminate/support": "^8.0|^9.0",
                 "php": "^7.3|^8.0"
@@ -9561,7 +9562,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2020-12-07T20:58:56+00:00"
+            "time": "2021-08-23T13:43:27+00:00"
         },
         {
             "name": "mockery/mockery",

docker-compose.yml

@@ -8,11 +8,15 @@ services:
       args:
         WWWGROUP: '${WWWGROUP}'
     image: sail-8.0/app
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
     ports:
       - '${APP_PORT:-8080}:80'
     environment:
       WWWUSER: '${WWWUSER}'
       LARAVEL_SAIL: 1
+      XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
+      XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
     volumes:
       - '.:/var/www/html'
     networks:
@@ -24,7 +28,7 @@ services:
   db:
     image: 'mysql:8.0'
     ports:
-      - '${DB_PORT:-3306}:3306'
+      - '${FORWARD_DB_PORT:-3306}:3306'
     environment:
       MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}'
       MYSQL_DATABASE: '${DB_DATABASE:-kcal}'
@@ -32,9 +36,13 @@ services:
       MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
-      - 'mysql-data:/var/lib/mysql'
+      - 'db-data:/var/lib/mysql'
     networks:
       - sail
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"]
+      retries: 3
+      timeout: 5s
   phpmyadmin:
     image: phpmyadmin
     ports:
@@ -47,7 +55,7 @@ services:
     depends_on:
       - db
   elasticsearch:
-    image: 'elasticsearch:7.12.0'
+    image: 'elasticsearch:7.14.1'
     environment:
       - xpack.security.enabled=false
       - discovery.type=single-node
@@ -64,6 +72,7 @@ services:
       - 'elasticsearch-data:/usr/share/elasticsearch/data'
     ports:
       - '${ELASTIC_PORT:-9200}:9200'
+      - '${ELASTIC_BIN_PORT:-9300}:9300'
     networks:
       - sail
   redis:
@@ -80,7 +89,7 @@ networks:
 volumes:
   elasticsearch-data:
     driver: local
-  mysql-data:
+  db-data:
     driver: local
   redis-data:
     driver: local