From 1a5078f87d2b84f192102942abaab471fe9a293f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 9 Dec 2020 16:33:59 +0100 Subject: [PATCH] Fixing pusher build + building in CI --- back/Dockerfile | 3 ++- back/package.json | 1 + pusher/Dockerfile | 12 +++--------- pusher/package.json | 1 + 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/back/Dockerfile b/back/Dockerfile index 02369b9f..5ec83a8f 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -10,6 +10,7 @@ COPY --from=builder --chown=docker:docker /var/www/messages/generated /usr/src/a RUN yarn install ENV NODE_ENV=production +RUN yarn run tsc -CMD ["yarn", "run", "prod"] +CMD ["yarn", "run", "runprod"] diff --git a/back/package.json b/back/package.json index d6c0fbef..d1e6d847 100644 --- a/back/package.json +++ b/back/package.json @@ -7,6 +7,7 @@ "tsc": "tsc", "dev": "ts-node-dev --respawn ./server.ts", "prod": "tsc && node --max-old-space-size=4096 ./dist/server.js", + "runprod": "node --max-old-space-size=4096 ./dist/server.js", "profile": "tsc && node --prof ./dist/server.js", "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json", "lint": "node_modules/.bin/eslint src/ . --ext .ts", diff --git a/pusher/Dockerfile b/pusher/Dockerfile index 02369b9f..24131240 100644 --- a/pusher/Dockerfile +++ b/pusher/Dockerfile @@ -1,15 +1,9 @@ -FROM thecodingmachine/workadventure-back-base:latest as builder -WORKDIR /var/www/messages -COPY --chown=docker:docker messages . -RUN yarn install && yarn proto - FROM thecodingmachine/nodejs:12 -COPY --chown=docker:docker back . -COPY --from=builder --chown=docker:docker /var/www/messages/generated /usr/src/app/src/Messages/generated +COPY --chown=docker:docker pusher . RUN yarn install ENV NODE_ENV=production +RUN yarn run tsc -CMD ["yarn", "run", "prod"] - +CMD ["yarn", "run", "runprod"] diff --git a/pusher/package.json b/pusher/package.json index d6c0fbef..d1e6d847 100644 --- a/pusher/package.json +++ b/pusher/package.json @@ -7,6 +7,7 @@ "tsc": "tsc", "dev": "ts-node-dev --respawn ./server.ts", "prod": "tsc && node --max-old-space-size=4096 ./dist/server.js", + "runprod": "node --max-old-space-size=4096 ./dist/server.js", "profile": "tsc && node --prof ./dist/server.js", "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json", "lint": "node_modules/.bin/eslint src/ . --ext .ts",