From 30a98b0dd96878681225a7109032c8d92f90e0b0 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 7 Dec 2023 19:05:52 -0500 Subject: [PATCH 01/10] docker health check --- Dockerfile | 2 ++ Dockerfile.dev | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 68f8f448..03863e9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,6 @@ WORKDIR /rems-admin COPY --chown=node:node . . RUN npm install EXPOSE 8090 +RUN apk add --no-cache curl +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:8090 || exit 1 CMD npm run start \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 1e11a5a3..13421526 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -4,4 +4,6 @@ COPY --chown=node:node . . RUN npm install EXPOSE 8090 EXPOSE 8091 +RUN apk add --no-cache curl +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:8090 || exit 1 CMD ./dockerRunnerDev.sh \ No newline at end of file From 908cd4f947c295fb8ba0bf37b0ba875cf9b276f1 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 7 Dec 2023 19:11:51 -0500 Subject: [PATCH 02/10] add curl --- Dockerfile | 5 ++++- Dockerfile.dev | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03863e9f..5d8bfd5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,9 @@ WORKDIR /rems-admin COPY --chown=node:node . . RUN npm install EXPOSE 8090 -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:8090 || exit 1 CMD npm run start \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 13421526..5888b044 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -4,6 +4,9 @@ COPY --chown=node:node . . RUN npm install EXPOSE 8090 EXPOSE 8091 -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:8090 || exit 1 CMD ./dockerRunnerDev.sh \ No newline at end of file From 94ec0607560403722ce5e516677b757f2ec54939 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 26 Dec 2023 14:32:14 -0500 Subject: [PATCH 03/10] commit submodule update --- src/rems-cds-hooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks index da1a46d2..9d175cc3 160000 --- a/src/rems-cds-hooks +++ b/src/rems-cds-hooks @@ -1 +1 @@ -Subproject commit da1a46d22b1d5ded3afe1be73dde06d20d080b53 +Subproject commit 9d175cc38fd2f484e65da8564f951a36e170558a From 5e7352197ffad240378e3290c49528259bab0f3f Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 26 Aug 2024 14:41:27 -0400 Subject: [PATCH 04/10] health check updates --- Dockerfile | 6 +++++- Dockerfile.dev | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ade6bf5..1f621597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,9 @@ FROM node:18-alpine WORKDIR /rems-admin + +ARG PORT +ENV PORT=${PORT} + COPY --chown=node:node . . RUN npm install EXPOSE 8090 @@ -7,6 +11,6 @@ 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:8090 || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:${PORT} || exit 1 EXPOSE 8095 CMD npm run start \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index bdb02c0e..8b07501a 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,5 +1,9 @@ FROM node:18-alpine WORKDIR /rems-admin + +ARG PORT +ENV PORT=${PORT} + COPY --chown=node:node . . RUN npm install EXPOSE 8090 @@ -8,7 +12,7 @@ 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:8090 || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:${PORT} || exit 1 EXPOSE 8095 EXPOSE 8096 CMD ./dockerRunnerDev.sh \ No newline at end of file From 3d631eb77ba6a13d3e5f41b3211fd85452b18e34 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 26 Aug 2024 15:00:20 -0400 Subject: [PATCH 05/10] hardcode health check port --- Dockerfile | 5 ++++- Dockerfile.dev | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f621597..f529a55a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM node:18-alpine WORKDIR /rems-admin +# Install MITRE Certs +RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | sh + ARG PORT ENV PORT=${PORT} @@ -11,6 +14,6 @@ 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:${PORT} || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:8090 || exit 1 EXPOSE 8095 CMD npm run start \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 8b07501a..079a2c5e 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,6 +1,10 @@ FROM node:18-alpine WORKDIR /rems-admin +# Install MITRE Certs +RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | sh + + ARG PORT ENV PORT=${PORT} @@ -12,7 +16,7 @@ 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:${PORT} || exit 1 +HEALTHCHECK --interval=60s --timeout=10m --retries=10 CMD curl --fail http://localhost:8090 || exit 1 EXPOSE 8095 EXPOSE 8096 CMD ./dockerRunnerDev.sh \ No newline at end of file From 599bd5f6c32ace30b33eff7096633393a4349371 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 27 Aug 2024 12:15:35 -0400 Subject: [PATCH 06/10] health check updates --- Dockerfile | 10 ++-------- Dockerfile.dev | 12 +++--------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index f529a55a..2a5eb75f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,13 @@ FROM node:18-alpine WORKDIR /rems-admin -# Install MITRE Certs -RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | sh - ARG PORT ENV PORT=${PORT} COPY --chown=node:node . . RUN npm install EXPOSE 8090 -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:8090 || exit 1 + +HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT} || exit 1 EXPOSE 8095 CMD npm run start \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 079a2c5e..e3b76efe 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,10 +1,6 @@ FROM node:18-alpine WORKDIR /rems-admin -# Install MITRE Certs -RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | sh - - ARG PORT ENV PORT=${PORT} @@ -12,11 +8,9 @@ COPY --chown=node:node . . RUN npm install EXPOSE 8090 EXPOSE 8091 -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:8090 || exit 1 + +HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:${PORT} || exit 1 + EXPOSE 8095 EXPOSE 8096 CMD ./dockerRunnerDev.sh \ No newline at end of file From 468dec3bfe6b8678d18901df925044eba32096c2 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 27 Aug 2024 12:25:24 -0400 Subject: [PATCH 07/10] docker args update --- Dockerfile | 2 +- Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a5eb75f..594e2cfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:18-alpine WORKDIR /rems-admin -ARG PORT +ARG PORT=8090 ENV PORT=${PORT} COPY --chown=node:node . . diff --git a/Dockerfile.dev b/Dockerfile.dev index e3b76efe..051e83bf 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,7 +1,7 @@ FROM node:18-alpine WORKDIR /rems-admin -ARG PORT +ARG PORT=8090 ENV PORT=${PORT} COPY --chown=node:node . . From d5844f4d56dea22f0850adddf0c61ff166419d12 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 16 Sep 2024 19:24:34 -0400 Subject: [PATCH 08/10] update cds hooks --- src/rems-cds-hooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks index 3ced784d..1dd79441 160000 --- a/src/rems-cds-hooks +++ b/src/rems-cds-hooks @@ -1 +1 @@ -Subproject commit 3ced784d3c13577c22c9012447f20e29b029632f +Subproject commit 1dd79441b51ec6c03659bc8e06b40b03d163ed8a From 6062309adc5a839e3c070cb011ea35183894decc Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 25 Sep 2024 13:19:43 -0400 Subject: [PATCH 09/10] update submodule --- src/rems-cds-hooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks index 1dd79441..84d093f3 160000 --- a/src/rems-cds-hooks +++ b/src/rems-cds-hooks @@ -1 +1 @@ -Subproject commit 1dd79441b51ec6c03659bc8e06b40b03d163ed8a +Subproject commit 84d093f3e9d2ea7e22aa4eeae32dfa3907187c49 From 00583b33c86386b10a76d784bdca74541ad9a96a Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 25 Sep 2024 13:37:34 -0400 Subject: [PATCH 10/10] update submodule --- src/rems-cds-hooks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks index 84d093f3..877bc730 160000 --- a/src/rems-cds-hooks +++ b/src/rems-cds-hooks @@ -1 +1 @@ -Subproject commit 84d093f3e9d2ea7e22aa4eeae32dfa3907187c49 +Subproject commit 877bc7301a69de0b57bcdb90e4c255aebec6244b