Merge pull request #29 from amayer5125/sail-upgrade

Update Sail to Version 1

composer.json

@@ -35,7 +35,7 @@
     "require-dev": {
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
-        "laravel/sail": "^0.0.5",
+        "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.3.3"

docker-compose.yml

@@ -1,3 +1,4 @@
+# For more information: https://laravel.com/docs/sail
 version: '3'
 services:
     laravel.test:
@@ -31,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}'
@@ -42,14 +43,22 @@ services:
             - 'sailmysql:/var/lib/mysql'
         networks:
             - sail
+        healthcheck:
+          test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"]
+          retries: 3
+          timeout: 5s
     redis:
         image: 'redis:alpine'
         ports:
-            - '${REDIS_PORT}:6379'
+            - '${FORWARD_REDIS_PORT:-6379}:6379'
         volumes:
             - 'sailredis:/data'
         networks:
             - sail
+        healthcheck:
+          test: ["CMD", "redis-cli", "ping"]
+          retries: 3
+          timeout: 5s
     # memcached:
     #     image: 'memcached:alpine'
     #     ports:
@@ -59,8 +68,8 @@ services:
     mailhog:
         image: 'mailhog/mailhog:latest'
         ports:
-            - 1025:1025
-            - 8025:8025
+            - '${FORWARD_MAILHOG_PORT:-1025}:1025'
+            - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025'
         networks:
             - sail
 networks: