Skip to content

Commit

Permalink
Merge pull request #10 from AnowarCST/laravel-7
Browse files Browse the repository at this point in the history
updated version of passport
  • Loading branch information
AnowarCST committed Aug 4, 2020
2 parents 42f0135 + f466957 commit 0018722
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 32 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"php": "^7.2.5",
"fideloper/proxy": "^4.0",
"laravel/framework": "^7.0",
"laravel/passport": "^8.3",
"laravel/passport": "^9.3",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0"
},
Expand Down
119 changes: 91 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ services:
build:
context: .
dockerfile: docker/Dockerfile
container_name: vue-starter-app
container_name: vue-starter
restart: unless-stopped
tty: true
environment:
SERVICE_NAME: vue-starter-app
SERVICE_NAME: vue-starter
SERVICE_TAGS: dev
working_dir: /var/www
volumes:
Expand Down Expand Up @@ -54,7 +54,7 @@ services:

#adminer for db access
adminer:
image: adminer
image: adminer:latest
restart: unless-stopped
ports:
- 8080:8080
Expand Down

0 comments on commit 0018722

Please sign in to comment.