From a625f7f9bfc304b73cbf894e58a19a28c06c4b95 Mon Sep 17 00:00:00 2001
From: Akshay <akshaysasidharan93@gmail.com>
Date: Thu, 9 Sep 2021 17:15:59 +0530
Subject: [PATCH] Fix npm scripts to be able to run from project root (#717)

* fix npm scripts to be able to run from project root

* copy package.json from root for prod dockerfile

* fix k8s deployment manifest template
---
 deploy/kubernetes/deployment.yaml | 2 +-
 docker/production.Dockerfile      | 3 +--
 package.json                      | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/deployment.yaml b/deploy/kubernetes/deployment.yaml
index 18e42e92e6..2bbe3cfcf4 100644
--- a/deploy/kubernetes/deployment.yaml
+++ b/deploy/kubernetes/deployment.yaml
@@ -23,7 +23,7 @@ spec:
         - name: container
           image: tooljet/tooljet-ce:latest
           imagePullPolicy: Always
-          args: ["npm", 'start:prod']
+          args: ["npm", "run", "start:prod"]
           resources:
             limits:
               memory: "2000Mi"
diff --git a/docker/production.Dockerfile b/docker/production.Dockerfile
index 3a9c05f011..55c1a93e41 100644
--- a/docker/production.Dockerfile
+++ b/docker/production.Dockerfile
@@ -11,6 +11,7 @@ RUN apt update && apt install -y \
 RUN mkdir -p /app
 WORKDIR /app
 ENV NODE_ENV=production
+COPY ./package.json ./package-lock.json .
 
 # Building ToolJet client
 COPY ./frontend/package.json ./frontend/package-lock.json ./frontend/
@@ -25,6 +26,4 @@ COPY ./server/ ./server/
 RUN npm install -g @nestjs/cli
 RUN npm --prefix server run build
 
-COPY ./docker/ ./docker/
-
 ENTRYPOINT ["./server/entrypoint.sh"]
diff --git a/package.json b/package.json
index b5faff0fb0..3201793ad9 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,10 @@
     "scripts": {
         "build": "npm --prefix frontend install && NODE_ENV=production npm --prefix frontend run build && npm --prefix server install && NODE_ENV=production npm --prefix server run build",
         "start:prod": "npm --prefix server run start:prod",
+        "db:create": "npm --prefix server run db:create",
+        "db:migrate": "npm --prefix server run db:migrate",
+        "db:reset": "npm --prefix server run db:reset",
+        "db:drop": "npm --prefix server run db:drop",
         "deploy": "cp -a frontend/build/. public/",
         "heroku-postbuild": "npm run build && npm run deploy",
         "heroku-prebuild": "npm --prefix frontend install && npm --prefix server install ",