diff --git a/.env.example b/.env.example index db4669ada..1ae5ca681 100644 --- a/.env.example +++ b/.env.example @@ -41,8 +41,7 @@ PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= PUSHER_APP_CLUSTER=mt1 -SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,127.0.0.1:8000 - +SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,localhost:8000,127.0.0.1:8000 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" diff --git a/docker/docker.env b/docker/docker.env index 15f5eb6c0..2e431ab58 100644 --- a/docker/docker.env +++ b/docker/docker.env @@ -23,12 +23,14 @@ REDIS_HOST=redis REDIS_PASSWORD=null REDIS_PORT=6379 -MAIL_DRIVER=smtp +MAIL_MAILER=smtp MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=null +MAIL_FROM_NAME="${APP_NAME}" AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= @@ -39,15 +41,13 @@ PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= PUSHER_APP_CLUSTER=mt1 +SANCTUM_STATEFUL_DOMAINS=localhost,127.0.0.1,127.0.0.1:8000,localhost:8000 -BASE_API=/api +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" +BASE_API=/api LARAVUE_USE_ESLINT=true LARAVUE_PATH= - -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_BASE_API="${BASE_API}" MIX_LARAVUE_PATH="${LARAVUE_PATH}" - -JWT_SECRET=cPfG9osVQx80HrUB4S43h8u1zSBXF35paKyyjTf36ppKaa8eTh6c9FmUY3B4jdhG diff --git a/laravue-entrypoint.sh b/laravue-entrypoint.sh index 718c5e2be..84b14a52d 100644 --- a/laravue-entrypoint.sh +++ b/laravue-entrypoint.sh @@ -20,7 +20,7 @@ then php artisan migrate --seed fi -npm install && npm run production +npm install -g cross-env && npm install && npm run production php artisan serve --host 0.0.0.0 diff --git a/package-lock.json b/package-lock.json index 1d017f327..ec31613ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "laravue", - "version": "0.11.0", + "version": "0.13.1", "lockfileVersion": 1, "requires": true, "dependencies": {