From 88256823e0fb042ebf26b5bfaa1fc03a3193b4ef Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 22 Feb 2024 11:02:08 +0000 Subject: [PATCH 1/4] Update containers to run on OpenShift --- node-red-container/Dockerfile | 9 ++++++++- node-red-container/Dockerfile-2.2.x | 9 ++++++++- node-red-container/Dockerfile-3.1 | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/node-red-container/Dockerfile b/node-red-container/Dockerfile index e4b465a5..be518513 100644 --- a/node-red-container/Dockerfile +++ b/node-red-container/Dockerfile @@ -10,16 +10,23 @@ COPY healthcheck.js /healthcheck.js COPY package.json /data WORKDIR /data +RUN mkdir node_modules RUN npm install USER root WORKDIR /usr/src/flowforge-nr-launcher -RUN chown node-red:node-red /data/* /usr/src/flowforge-nr-launcher +RUN chown -R node-red:node-red /usr/src/flowforge-nr-launcher USER node-red RUN npm install @flowfuse/nr-launcher@${BUILD_TAG} +USER root +RUN chmod -R g+w /data/* /data/.npm/* +RUN chown -R node-red:root /data/* /data/.npm/* + +USER node-red + ENV NODE_PATH=/usr/src/node-red ENV HOME=/usr/src/node-red diff --git a/node-red-container/Dockerfile-2.2.x b/node-red-container/Dockerfile-2.2.x index c6567aad..650f6d22 100644 --- a/node-red-container/Dockerfile-2.2.x +++ b/node-red-container/Dockerfile-2.2.x @@ -10,16 +10,23 @@ COPY healthcheck.js /healthcheck.js COPY package.json /data WORKDIR /data +RUN mkdir node_modules RUN npm install USER root WORKDIR /usr/src/flowforge-nr-launcher -RUN chown node-red:node-red /data/* /usr/src/flowforge-nr-launcher +RUN chown -R node-red:node-red /usr/src/flowforge-nr-launcher USER node-red RUN npm install @flowfuse/nr-launcher@${BUILD_TAG} +USER root +RUN chmod -R g+w /data/* /data/.npm/* +RUN chown -R node-red:root /data/* /data/.npm/* + +USER node-red + ENV NODE_PATH=/usr/src/node-red ENV HOME=/usr/src/node-red diff --git a/node-red-container/Dockerfile-3.1 b/node-red-container/Dockerfile-3.1 index 1b9b4d98..5130486b 100644 --- a/node-red-container/Dockerfile-3.1 +++ b/node-red-container/Dockerfile-3.1 @@ -10,16 +10,23 @@ COPY healthcheck.js /healthcheck.js COPY package.json /data WORKDIR /data +RUN mkdir node_modules RUN npm install USER root WORKDIR /usr/src/flowforge-nr-launcher -RUN chown node-red:node-red /data/* /usr/src/flowforge-nr-launcher +RUN chown -R node-red:node-red /usr/src/flowforge-nr-launcher USER node-red RUN npm install @flowfuse/nr-launcher@${BUILD_TAG} +USER root +RUN chmod -R g+w /data/* /data/.npm/* +RUN chown -R node-red:root /data/* /data/.npm/* + +USER node-red + ENV NODE_PATH=/usr/src/node-red ENV HOME=/usr/src/node-red From 9beee1a6cd36f8b7a0a2efd4533ee564934e2bcf Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 29 Feb 2024 11:19:15 +0000 Subject: [PATCH 2/4] Add resource limits to upgrade job --- helm/flowforge/templates/job-upgrade-db.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/helm/flowforge/templates/job-upgrade-db.yaml b/helm/flowforge/templates/job-upgrade-db.yaml index c5555b14..30a2eb52 100644 --- a/helm/flowforge/templates/job-upgrade-db.yaml +++ b/helm/flowforge/templates/job-upgrade-db.yaml @@ -48,6 +48,15 @@ spec: command: - /bin/sh - /usr/local/upgrade.sh + resources: + requests: + ephemeral-storage: "100Mi" + cpu: 100m + memory: 128Mi + limits: + ephemeral-storage: "100Mi" + cpu: 100m + memory: 128Mi volumes: - name: upgrade-script configMap: From a606026d6acbed145a4fee070f200b2c8c4f0649 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 6 Mar 2024 13:14:59 +0000 Subject: [PATCH 3/4] Remove ephermal storage limit --- helm/flowforge/templates/job-upgrade-db.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/helm/flowforge/templates/job-upgrade-db.yaml b/helm/flowforge/templates/job-upgrade-db.yaml index 30a2eb52..ee4dcb11 100644 --- a/helm/flowforge/templates/job-upgrade-db.yaml +++ b/helm/flowforge/templates/job-upgrade-db.yaml @@ -50,11 +50,9 @@ spec: - /usr/local/upgrade.sh resources: requests: - ephemeral-storage: "100Mi" cpu: 100m memory: 128Mi limits: - ephemeral-storage: "100Mi" cpu: 100m memory: 128Mi volumes: From cee19f43c143d68ea87e04d6f535b8aed28334d3 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 6 Mar 2024 13:27:21 +0000 Subject: [PATCH 4/4] Revert NR 2.2.x container --- node-red-container/Dockerfile-2.2.x | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/node-red-container/Dockerfile-2.2.x b/node-red-container/Dockerfile-2.2.x index 650f6d22..c6567aad 100644 --- a/node-red-container/Dockerfile-2.2.x +++ b/node-red-container/Dockerfile-2.2.x @@ -10,23 +10,16 @@ COPY healthcheck.js /healthcheck.js COPY package.json /data WORKDIR /data -RUN mkdir node_modules RUN npm install USER root WORKDIR /usr/src/flowforge-nr-launcher -RUN chown -R node-red:node-red /usr/src/flowforge-nr-launcher +RUN chown node-red:node-red /data/* /usr/src/flowforge-nr-launcher USER node-red RUN npm install @flowfuse/nr-launcher@${BUILD_TAG} -USER root -RUN chmod -R g+w /data/* /data/.npm/* -RUN chown -R node-red:root /data/* /data/.npm/* - -USER node-red - ENV NODE_PATH=/usr/src/node-red ENV HOME=/usr/src/node-red