Skip to content

Commit

Permalink
Merge pull request #102 from ISTTP/develop
Browse files Browse the repository at this point in the history
Node alpine 이미지 레이어 변경에 따른 Prisma 업데이트 반영
  • Loading branch information
kyr4601 authored Dec 18, 2024
2 parents 9ecbdd3 + 7b7338a commit a41d597
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 71 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/mainDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ name: Deploy with Docker Compose
on:
push:
branches: ["main"]
workflow_dispatch:
inputs:
clear_cache:
description: 'Clear Docker cache? (true/false)'
required: false
default: 'false'


jobs:
test:
Expand Down Expand Up @@ -158,6 +165,10 @@ jobs:

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Prune Docker builder cache (when we want to clear cache)
if: ${{ github.event.inputs.clear_cache == 'true' }}
run: docker builder prune --all --force

- name: Cache Docker layers
uses: docker/bake-action@master
Expand Down
4 changes: 2 additions & 2 deletions packages/database/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"devDependencies": {
"@isttp/eslint-config": "workspace:*",
"@isttp/typescript-config": "workspace:*",
"prisma": "^5.17.0",
"prisma": "^6.1.0",
"typescript": "^5.3.3"
},
"dependencies": {
"@prisma/client": "^5.17.0"
"@prisma/client": "6.1.0"
}
}
118 changes: 49 additions & 69 deletions pnpm-lock.yaml

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

0 comments on commit a41d597

Please sign in to comment.