diff --git a/dockerfile-captain.release b/dockerfile-captain.release index 1720c32..6ae02f8 100644 --- a/dockerfile-captain.release +++ b/dockerfile-captain.release @@ -2,9 +2,31 @@ FROM node:10 RUN mkdir -p /usr/src/app 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 run build + + + + +# Build frontend code + +ENV FRONTEND_COMMIT_HASH 79859ddcc0b0b1530a1f3c51420b8a3a6370dc69 + +RUN git clone https://github.com/githubsaturn/caprover-frontend.git && \ + cd caprover-frontend && \ + git reset --hard ${FRONTEND_COMMIT_HASH} && \ + npm install && npm cache clean --force && \ + npm run build && + mv ./build ../dist-frontend + + ENV NODE_ENV production diff --git a/package-lock.json b/package-lock.json index 0b46656..5dd92ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2535,14 +2535,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2557,20 +2555,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2687,8 +2682,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2700,7 +2694,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2715,7 +2708,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2723,14 +2715,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2749,7 +2739,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2830,8 +2819,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2843,7 +2831,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2965,7 +2952,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/package.json b/package.json index ba64582..9b5802c 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "start": "node ./bin/www", "dev": "echo 'RECOMPILING' && npx madge --circular --extensions ts ./ && rm -rf ./built && npx tsc && sudo ./dev-reset-service.sh", "tslint": "tslint -c tslint.json -p tsconfig.json", + "build": "npx tsc", "test": "jest" }, "dependencies": { @@ -63,4 +64,4 @@ "devDependencies": { "jest": "^23.6.0" } -} \ No newline at end of file +}