Merge branch '2.7' into app_design

steedos · Sep 25, 2024 · e75c298 · e75c298
2 parents 3453f78 + 8f2816e
commit e75c298
Show file tree

Hide file tree

Showing 106 changed files with 1,791 additions and 398 deletions.
diff --git a/.github/workflows/npm-sync.yml b/.github/workflows/npm-sync.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # checkout branch 2.6
+      # checkout branch 2.7
       - name: Checkout branch 2.7
         uses: actions/checkout@v2
         with: 

diff --git a/deploy/.gitignore b/deploy/.gitignore
@@ -1,4 +1,5 @@
 storage
 .env
 mongo-data
-info.json
+info.json
+yarn.lock
diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile
@@ -75,6 +75,12 @@ WORKDIR /opt/steedos/unpkg
 
 RUN yarn && yarn cache clean
 
+# nodered
+COPY ./app/nodered /opt/steedos/nodered
+WORKDIR /opt/steedos/nodered
+
+RUN yarn && yarn cache clean
+
 COPY ./fs /
 
 # Remove cached files