feat: Openshift container changes (#340)

FlowFuse · Mar 6, 2024 · 3726e30 · 3726e30
2 parents bc82d87 + 8bf8248
commit 3726e30
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/helm/flowforge/templates/job-upgrade-db.yaml b/helm/flowforge/templates/job-upgrade-db.yaml
@@ -48,6 +48,13 @@ spec:
         command:
         - /bin/sh
         - /usr/local/upgrade.sh
+        resources:
+          requests:
+            cpu: 100m
+            memory: 128Mi
+          limits:
+            cpu: 100m
+            memory: 128Mi
       volumes:
       - name: upgrade-script
         configMap:

diff --git 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-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