Merge branch 'dev' into 649_script_single_endpoint

Dockerfile

@@ -1,23 +1,18 @@
 FROM node:14-alpine
-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
-
 EXPOSE 5050
-EXPOSE 5051
 
-CMD ./dockerRunnerProd.sh
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD (wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending && wget --no-verbose --tries=1 --spider http://localhost:5050) || exit 1
+
+CMD ./dockerRunnerProd.sh

Dockerfile.dev

@@ -2,15 +2,12 @@ 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
 

backend/env.json

@@ -20,12 +20,12 @@
   },
   "MONGO_USERNAME": {
     "type": "string",
-    "default": "rems-admin-pims-root"
+    "default": "pims-user"
   },
 
   "MONGO_PASSWORD": {
     "type": "string",
-    "default": "rems-admin-pims-password"
+    "default": "pims-pass"
   },
 
   "MONGO_URL": {
@@ -35,7 +35,7 @@
 
   "AUTH_SOURCE": {
     "type": "string",
-    "default": "admin"
+    "default": "pims"
   },
 
   "HTTPS_KEY_PATH": {