Skip to content

Commit

Permalink
Update README and docker files
Browse files Browse the repository at this point in the history
  • Loading branch information
tuandm committed Mar 10, 2020
1 parent 050ffbd commit ab65927
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>
<p align="center">
<a href="https://laravel.com">
<img src="https://img.shields.io/badge/laravel-6.9-brightgreen.svg" alt="vue">
<img src="https://img.shields.io/badge/laravel-6.18-brightgreen.svg" alt="vue">
</a>
<a href="https://github.com/vuejs/vue">
<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen.svg" alt="vue">
Expand Down Expand Up @@ -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
Expand All @@ -72,9 +72,9 @@ docker exec -it <container ID> php artisan migrate --seed
# Where <container ID> is the "laravel" container name, ex: docker_laravel_1
```

`yarn` commands are also supported:
`npm` commands are also supported:
```sh
docker exec -it <container ID> yarn run watch
docker exec -it <container ID> npm run watch
# Where <container ID> is the "laravel" container name, ex: docker_laravel_1
...
```
Expand Down
4 changes: 2 additions & 2 deletions laravue-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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

8 changes: 4 additions & 4 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit ab65927

Please sign in to comment.