Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing pusher build + building in CI

Browse source
This commit is contained in:
David Négrier 2020-12-09 16:33:59 +01:00
parent ff17cb99d6
commit 1a5078f87d
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
back/Dockerfile
View file

@ -10,6 +10,7 @@ COPY --from=builder --chown=docker:docker /var/www/messages/generated /usr/src/a
RUN yarn install RUN yarn install
ENV NODE_ENV=production ENV NODE_ENV=production
RUN yarn run tsc
CMD ["yarn", "run", "prod"] CMD ["yarn", "run", "runprod"]

1
back/package.json
View file

@ -7,6 +7,7 @@
"tsc": "tsc", "tsc": "tsc",
"dev": "ts-node-dev --respawn ./server.ts", "dev": "ts-node-dev --respawn ./server.ts",
"prod": "tsc && node --max-old-space-size=4096 ./dist/server.js", "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", "profile": "tsc && node --prof ./dist/server.js",
"test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json", "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
"lint": "node_modules/.bin/eslint src/ . --ext .ts", "lint": "node_modules/.bin/eslint src/ . --ext .ts",

12
pusher/Dockerfile
View file

@ -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 FROM thecodingmachine/nodejs:12
COPY --chown=docker:docker back . COPY --chown=docker:docker pusher .
COPY --from=builder --chown=docker:docker /var/www/messages/generated /usr/src/app/src/Messages/generated
RUN yarn install RUN yarn install
ENV NODE_ENV=production ENV NODE_ENV=production
RUN yarn run tsc
CMD ["yarn", "run", "prod"] CMD ["yarn", "run", "runprod"]

1
pusher/package.json
View file

@ -7,6 +7,7 @@
"tsc": "tsc", "tsc": "tsc",
"dev": "ts-node-dev --respawn ./server.ts", "dev": "ts-node-dev --respawn ./server.ts",
"prod": "tsc && node --max-old-space-size=4096 ./dist/server.js", "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", "profile": "tsc && node --prof ./dist/server.js",
"test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json", "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
"lint": "node_modules/.bin/eslint src/ . --ext .ts", "lint": "node_modules/.bin/eslint src/ . --ext .ts",