Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dangtony98 committed Jan 3, 2023
2 parents c7c5a94 + 212ca72 commit 9727075
Show file tree
Hide file tree
Showing 42 changed files with 1,273 additions and 668 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-be-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cache: "npm"
cache-dependency-path: backend/package-lock.json
- name: 📦 Install dependencies
run: npm ci --only-production --ignore-scripts
run: npm ci --only-production
working-directory: backend
- name: 🧪 Run tests
run: npm run test:ci
Expand Down
5 changes: 4 additions & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ WORKDIR /app

COPY package.json package-lock.json ./

RUN npm ci --only-production --ignore-scripts
# RUN npm ci --only-production --ignore-scripts
# "prepare": "cd .. && npm install"

RUN npm ci --only-production

COPY . .

Expand Down
Loading

0 comments on commit 9727075

Please sign in to comment.