diff --git a/Dockerfile b/Dockerfile index 089bc69e7..43ed02ac2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,9 +24,9 @@ RUN npm install -g yarn COPY . . COPY .env.example .env -RUN yarn install && yarn run production +RUN npm install && npm run production RUN composer install -RUN php artisan jwt:secret +RUN php artisan passport:install ENTRYPOINT ["php", "artisan", "serve", "--host", "0.0.0.0"] diff --git a/README.md b/README.md index c8e5f5c69..bba1b863f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- vue + vue vue @@ -46,17 +46,17 @@ cd laravue # Migration and DB seeder (after changing your DB settings in .env) php artisan migrate --seed -# Generate JWT secret key -php artisan jwt:secret +# Install passport +php artisan passport:install -# Install dependency - we recommend using Yarn instead of NPM since we get errors while using NPM -yarn install +# Install dependency with NPM +npm install # develop -yarn run dev # or yarn run watch +npm run dev # or npm run watch # Build on production -yarn run production +npm run production ``` #### Docker @@ -72,9 +72,9 @@ docker exec -it php artisan migrate --seed # Where is the "laravel" container name, ex: docker_laravel_1 ``` -`yarn` commands are also supported: +`npm` commands are also supported: ```sh -docker exec -it yarn run watch +docker exec -it npm run watch # Where is the "laravel" container name, ex: docker_laravel_1 ... ``` diff --git a/laravue-entrypoint.sh b/laravue-entrypoint.sh index b8b0310f4..f1dcd5886 100644 --- a/laravue-entrypoint.sh +++ b/laravue-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -composer install && php artisan jwt:secret -yarn install && yarn run dev +composer install && php artisan passport:install +npm install && npm run dev php artisan serve --host 0.0.0.0 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 79981c699..ee149a346 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { - "/js/app.js": "/js/app.js", - "/css/app.css": "/css/app.css", - "/js/manifest.js": "/js/manifest.js", - "/js/vendor.js": "/js/vendor.js" + "/js/app.js": "/js/app.js?id=f33f0c1e5e246d669bf9", + "/css/app.css": "/css/app.css?id=65502353c410f352ded4", + "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e", + "/js/vendor.js": "/js/vendor.js?id=cc2157418d21994c7d59" }