Resolve merge conflicts

Infisical · Jan 3, 2023 · 9727075 · 9727075
2 parents c7c5a94 + 212ca72
commit 9727075
Show file tree

Hide file tree

Showing 42 changed files with 1,273 additions and 668 deletions.
diff --git a/.github/workflows/check-be-pull-request.yml b/.github/workflows/check-be-pull-request.yml
@@ -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

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -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 . .