Merge branch 'dev' into 735-rxfill

Dockerfile

@@ -3,15 +3,21 @@ 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
 
-CMD [ "pm2-docker", "pm2.config.js" ]
+CMD ./dockerRunnerProd.sh

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

dockerRunnerProd.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cd frontend
+npm install 
+( npm run start ) & SERVER_PID=$!
+
+cd ../backend
+npm install 
+( npm run start ) & BACKEND_SERVER_PID=$!
+
+# Handle application background process exiting
+wait $SERVER_PID $BACKEND_SERVER_PID
+EXIT_CODE=$?
+echo "application exited with exit code $EXIT_CODE..."