From 65f917d29f8ecb898b174db5b3dabf4e7940c65b Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Fri, 18 Jan 2019 22:35:05 -0800
Subject: [PATCH] Simplified docker files

---
 dockerfile-captain.edge    | 4 ++--
 dockerfile-captain.release | 3 +--
 package.json               | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dockerfile-captain.edge b/dockerfile-captain.edge
index 48d494f..658c521 100644
--- a/dockerfile-captain.edge
+++ b/dockerfile-captain.edge
@@ -5,10 +5,10 @@ WORKDIR /usr/src/app
 
 # Build backend code
 
-COPY package.json /usr/src/app/
-RUN npm install && npm cache clean --force
 COPY . /usr/src/app
+RUN npm install && npm cache clean --force
 RUN npm run build
+
 RUN mv ./edge-override.json ./config-override.json
 
 
diff --git a/dockerfile-captain.release b/dockerfile-captain.release
index 25b60ff..fe25b71 100644
--- a/dockerfile-captain.release
+++ b/dockerfile-captain.release
@@ -7,9 +7,8 @@ WORKDIR /usr/src/app
 
 # Build backend code
 
-COPY package.json /usr/src/app/
-RUN npm install && npm cache clean --force
 COPY . /usr/src/app
+RUN npm install && npm cache clean --force
 RUN npm run build
 
 
diff --git a/package.json b/package.json
index 2f2f8af..e628a79 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "dev": "echo 'RECOMPILING' && npx madge --circular --extensions ts ./ && rm -rf ./built && npx tsc && sudo ./dev-scripts/dev-reset-service.sh",
     "clean": "sudo ./dev-scripts/dev-clean-run-as-dev.sh",
     "tslint": "tslint -c tslint.json -p tsconfig.json",
-    "build": "echo \"USE DEPLOY SCRIPT\" ",
+    "build": "rm -rf ./built && npx tsc",
     "test": "jest"
   },
   "dependencies": {