diff --git a/Dockerfile b/Dockerfile index 55301be..e7ffdad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,19 @@ ENV NODE_ENV production WORKDIR /home/node/app COPY --chown=node:node . . +RUN npm install -g typescript + WORKDIR /home/node/app/backend RUN npm install +RUN npm link typescript + WORKDIR /home/node/app/frontend RUN npm install +RUN npm link typescript + WORKDIR /home/node/app -RUN npm install pm2 -g +# RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 diff --git a/Dockerfile.dev b/Dockerfile.dev index a575c3a..37bb419 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -2,10 +2,16 @@ FROM node:14-alpine WORKDIR /home/node/app COPY --chown=node:node . . +RUN npm install -g typescript + WORKDIR /home/node/app/backend RUN npm install +RUN npm link typescript + WORKDIR /home/node/app/frontend RUN npm install +RUN npm link typescript + WORKDIR /home/node/app EXPOSE 5050 diff --git a/dockerRunnerProd.sh b/dockerRunnerProd.sh index 37e210e..bd99081 100755 --- a/dockerRunnerProd.sh +++ b/dockerRunnerProd.sh @@ -1,9 +1,9 @@ #!/bin/sh cd frontend -npm install | tee ./logs/frontend_installer.log -( npm run start | tee ./logs/frontend_runner.log ) & SERVER_PID=$! +npm install +( npm run start ) & SERVER_PID=$! cd ../backend -npm install | tee ./logs/backend_installer.log -( npm run start | tee ./logs/backend_runner.log ) & BACKEND_SERVER_PID=$! +npm install +( npm run start ) & BACKEND_SERVER_PID=$!