From 9f1698fc6222a901da256a36c81f4d4381101a5c Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 7 Dec 2023 19:05:30 -0500 Subject: [PATCH 01/13] docker healthcheck --- Dockerfile | 3 +++ Dockerfile.dev | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 67c0f04..bf04130 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,5 +13,8 @@ RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 +RUN apk add --no-cache curl + +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:3000 || exit 1 CMD [ "pm2-docker", "pm2.config.js" ] \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 436f2df..5a52516 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -12,5 +12,8 @@ RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 +RUN apk add --no-cache curl + +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD (rems-setup % curl --fail http://localhost:5051/doctorOrders/api/getRx && curl --fail http://localhost:5050) || exit 1 CMD ./dockerRunnerDev.sh \ No newline at end of file From f761a08a56d02a99592ee27ae0c36805710c678a Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 7 Dec 2023 19:11:43 -0500 Subject: [PATCH 02/13] add curl --- Dockerfile | 5 ++++- Dockerfile.dev | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf04130..2ded301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,10 @@ RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 -RUN apk add --no-cache curl +RUN apk update +RUN apk upgrade +RUN apk search curl +RUN apk add curl HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:3000 || exit 1 diff --git a/Dockerfile.dev b/Dockerfile.dev index 5a52516..b262d92 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -12,7 +12,10 @@ RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 -RUN apk add --no-cache curl +RUN apk update +RUN apk upgrade +RUN apk search curl +RUN apk add curl HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD (rems-setup % curl --fail http://localhost:5051/doctorOrders/api/getRx && curl --fail http://localhost:5050) || exit 1 From 971708dfc3772780d25112ad3d5a45b1a1ed855d Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 8 Dec 2023 13:57:20 -0500 Subject: [PATCH 03/13] remove env - causes fail run exec for some reason --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ded301..db5b1fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM node:14-alpine -ENV NODE_ENV production WORKDIR /home/node/app COPY --chown=node:node . . From 507751d5f956cca3e66bdc356120a670ab92871c Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 24 Jan 2024 14:03:20 -0500 Subject: [PATCH 04/13] update eof line endings for sh script --- dockerRunnerDev.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 dockerRunnerDev.sh diff --git a/dockerRunnerDev.sh b/dockerRunnerDev.sh old mode 100755 new mode 100644 From d1817e24510f3673b1fb136482a253e2cb03ac51 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 31 Jan 2024 09:07:52 -0500 Subject: [PATCH 05/13] fix dockerRunner file Permissions --- Dockerfile.dev | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.dev b/Dockerfile.dev index b262d92..c12e9db 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -10,6 +10,8 @@ WORKDIR /home/node/app RUN npm install pm2 -g +RUN chmod +x dockerRunnerDev.sh + EXPOSE 5050 EXPOSE 5051 RUN apk update From 1e51135bc692c6afbe3cb240015428460fb626c4 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 31 Jan 2024 09:34:49 -0500 Subject: [PATCH 06/13] create log files in dockerRunner --- dockerRunnerDev.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dockerRunnerDev.sh b/dockerRunnerDev.sh index 02a0cfd..177f769 100644 --- a/dockerRunnerDev.sh +++ b/dockerRunnerDev.sh @@ -4,6 +4,10 @@ trap 'kill $CONTINUOUS_INSTALL_PID $SERVER_PID $BACKEND_SERVER_PID; exit' INT mkdir logs +touch ./logs/frontend_installer.log +touch ./logs/frontend_runner.log +touch ./logs/backend_installer.log +touch ./logs/backend_runner.log # Reset log file content for new application boot echo "*** Logs for continuous frontend installer ***" > ./logs/frontend_installer.log From c42e3ef05aa2c01d35dbb0de71df8db1165d426d Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 26 Aug 2024 14:41:10 -0400 Subject: [PATCH 07/13] health check updates --- Dockerfile | 2 +- Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index db5b1fe..6ad2317 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,6 @@ RUN apk upgrade RUN apk search curl RUN apk add curl -HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:3000 || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail (curl --fail http://localhost:5051/doctorOrders/api/getRx/pending && curl --fail http://localhost:5050) || exit 1 CMD [ "pm2-docker", "pm2.config.js" ] \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 26dc349..04fba90 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -15,6 +15,6 @@ RUN apk upgrade RUN apk search curl RUN apk add curl -HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD (rems-setup % curl --fail http://localhost:5051/doctorOrders/api/getRx && curl --fail http://localhost:5050) || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD (curl --fail http://localhost:5051/doctorOrders/api/getRx/pending && curl --fail http://localhost:5050) || exit 1 CMD ./dockerRunnerDev.sh \ No newline at end of file From 732d971e9ad421153236ef89326ef57e6fc1391f Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 27 Aug 2024 12:15:10 -0400 Subject: [PATCH 08/13] healtcheck updates --- Dockerfile | 6 +----- Dockerfile.dev | 6 +----- backend/env.json | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ad2317..d97db78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,7 @@ RUN npm install pm2 -g EXPOSE 5050 EXPOSE 5051 -RUN apk update -RUN apk upgrade -RUN apk search curl -RUN apk add curl -HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail (curl --fail http://localhost:5051/doctorOrders/api/getRx/pending && curl --fail http://localhost:5050) || exit 1 +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 [ "pm2-docker", "pm2.config.js" ] \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 04fba90..a16138f 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -10,11 +10,7 @@ WORKDIR /home/node/app EXPOSE 5050 EXPOSE 5051 -RUN apk update -RUN apk upgrade -RUN apk search curl -RUN apk add curl -HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD (curl --fail http://localhost:5051/doctorOrders/api/getRx/pending && curl --fail http://localhost:5050) || exit 1 +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 ./dockerRunnerDev.sh \ No newline at end of file diff --git a/backend/env.json b/backend/env.json index 02bc8c7..91d96f2 100644 --- a/backend/env.json +++ b/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": { From 7b7a9224b9113258b7790837ea2d200dc5b3ba4c Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 27 Aug 2024 15:19:25 -0400 Subject: [PATCH 09/13] auth issues pims --- backend/env.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/env.json b/backend/env.json index 91d96f2..470aa40 100644 --- a/backend/env.json +++ b/backend/env.json @@ -35,7 +35,7 @@ "AUTH_SOURCE": { "type": "string", - "default": "admin" + "default": "pims" }, "HTTPS_KEY_PATH": { From cb92d9df4f12b69c312164242514ea6ca6371e4a Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 16 Sep 2024 15:33:28 -0400 Subject: [PATCH 10/13] docker file helath check update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a70286..35e67da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,6 @@ WORKDIR /home/node/app EXPOSE 5050 -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 +HEALTHCHECK --interval=30s --start-period=60s --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 From 63dc0b73683fa381b1472c651ed8b7f6592f7bce Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 16 Sep 2024 16:00:15 -0400 Subject: [PATCH 11/13] remove npm install at run time --- dockerRunnerProd.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerRunnerProd.sh b/dockerRunnerProd.sh index ebf5b4f..2c2806e 100755 --- a/dockerRunnerProd.sh +++ b/dockerRunnerProd.sh @@ -1,11 +1,9 @@ #!/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 From f72d04158690bb56c8eaa1597ef414a1e3b5787e Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 16 Sep 2024 17:10:34 -0400 Subject: [PATCH 12/13] health check command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35e67da..3dd4eef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,6 @@ WORKDIR /home/node/app EXPOSE 5050 -HEALTHCHECK --interval=30s --start-period=60s --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 +HEALTHCHECK --interval=30s --start-period=60s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending || exit 1 CMD ./dockerRunnerProd.sh From 2a29d07b88dfe1fe7db7568bc80f44f65fe09b0e Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 20 Sep 2024 11:16:21 -0400 Subject: [PATCH 13/13] dockerRunnerDev chmod +x --- dockerRunnerDev.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dockerRunnerDev.sh diff --git a/dockerRunnerDev.sh b/dockerRunnerDev.sh old mode 100644 new mode 100755