No commit message

steedos · Dec 16, 2024 · 2904f1f · 2904f1f
2 parents 30b9a7e + b9c63ad
commit 2904f1f
Show file tree

Hide file tree

Showing 95 changed files with 421 additions and 394 deletions.
diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile
@@ -9,6 +9,7 @@ ENV TZ=Etc/UTC
 RUN apt-get update || : && apt-get install -y \
     python \
     curl \
+    jq \
     build-essential 
 
 # Install MongoDB 4.4.25

diff --git a/deploy/enterprise/app/builder6/package.json b/deploy/enterprise/app/builder6/package.json
@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
-    "@builder6/server": "^0.2.3"
+    "@builder6/server": "^0.3.6"
   }
 }
diff --git a/deploy/enterprise/app/builder6/startup.sh b/deploy/enterprise/app/builder6/startup.sh
@@ -5,15 +5,39 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 
 # 获取 Node.js 20 的实际路径
-NODE_PATH=$(nvm which 20)
+NODEJS_DIR=$(nvm which 20)
 
-if [ -z "$NODE_PATH" ]; then
-    echo "Error: Node.js 14 is not installed. Please install it with nvm."
+if [ -z "$NODEJS_DIR" ]; then
+    echo "Error: Node.js 20 is not installed. Please install it with nvm."
     exit 1
 fi
 
 # 切换到工作目录
 cd /opt/steedos/builder6 || exit
 
-# 使用 Node.js 14 运行应用
-exec "$NODE_PATH" ./node_modules/@builder6/server/dist/b6.server.js -u "$STEEDOS_STORAGE_DIR/builder6"
+
+# 检查是否定义了 B6_SERVER_VERSION 环境变量
+if [ -z "$B6_SERVER_VERSION" ]; then
+    echo "Environment variable B6_SERVER_VERSION is not set. Skipping version check."
+else
+    # 获取 package.json 中的 @builder/server 版本号
+    if ! command -v jq &>/dev/null; then
+        echo "jq is not installed. Please install it using 'sudo apt install -y jq'."
+        exit 1
+    fi
+
+    B6_SERVER_VERSION_INSTALLED=$(jq -r '.dependencies["@builder6/server"]' package.json)
+
+    # 比对环境变量版本号与 package.json 中的版本号
+    if [ "$B6_SERVER_VERSION" != "$B6_SERVER_VERSION_INSTALLED" ]; then
+        echo "B6_SERVER_VERSION mismatch, installed: @builder6/server@$B6_SERVER_VERSION_INSTALLED"
+        echo "Install new version @builder6/server@$B6_SERVER_VERSION"
+        nvm exec 20 npm install @builder6/server@"$B6_SERVER_VERSION" --omit=dev --no-audit --no-update-notifier --no-fund
+    else
+        echo "Version match: B6_SERVER_VERSION=$B6_SERVER_VERSION"
+    fi
+fi
+
+
+# 使用 Node.js 20 运行应用
+exec "$NODEJS_DIR" ./node_modules/@builder6/server/dist/b6.server.js -u "$STEEDOS_STORAGE_DIR"/builder6
diff --git a/deploy/enterprise/docker-compose.yml b/deploy/enterprise/docker-compose.yml
@@ -31,9 +31,10 @@ services:
       - NPM_CACHE_PACKAGE_CONTENT=true
       - NPM_REGISTRY_URL=https://registry.npmmirror.com
       - STEEDOS_WIDGETS_ADDITIONAL=@steedos-widgets/liveblocks
+      - B6_SERVER_VERSION=^0.3.6
       - B6_PLUGIN_PACKAGES=@builder6/node-red,lodash
-      - B6_PLUGIN_SERVICES=@builder6/node-red
-      - B6_PLUGIN_NPMRC=registry=https://registry.npmmirror.com
+      - B6_PLUGIN_SERVICES=
+      - B6_PLUGIN_MODULES=
     tty: true
     volumes:
       - "./steedos-storage:/steedos-storage"

diff --git a/deploy/enterprise/fs/opt/steedos/entrypoint.sh b/deploy/enterprise/fs/opt/steedos/entrypoint.sh
@@ -242,7 +242,7 @@ configure_supervisord() {
   cp -f "$supervisord_conf_source"/steedos.conf "$SUPERVISORD_CONF_TARGET"
   cp -f "$supervisord_conf_source"/unpkg.conf "$SUPERVISORD_CONF_TARGET"
   cp -f "$supervisord_conf_source"/nodered.conf "$SUPERVISORD_CONF_TARGET"
-  cp -f "$supervisord_conf_source"/api.conf "$SUPERVISORD_CONF_TARGET"
+  cp -f "$supervisord_conf_source"/builder6.conf "$SUPERVISORD_CONF_TARGET"
 
   # Disable services based on configuration
   if [[ -z "${DYNO}" ]]; then
@@ -304,12 +304,13 @@ fi
 
 
 mkdir -p /steedos-storage/unpkg
+mkdir -p /steedos-storage/builder6
 
 # Ensure the restore path exists in the container, so an archive can be copied to it, if need be.
 mkdir -p /steedos-storage/data/{backup,restore,nodered,unpkg}
 
 # Create sub-directory to store services log in the container mounting folder
-mkdir -p /steedos-storage/logs/{supervisor,steedos,cron,mongodb,redis,nginx,unpkg,nodered,api}
+mkdir -p /steedos-storage/logs/{supervisor,steedos,cron,mongodb,redis,nginx,unpkg,nodered,builder6}
 
 configure_supervisord
 

diff --git a/...pt/steedos/templates/supervisord/api.conf → ...eedos/templates/supervisord/builder6.conf b/...pt/steedos/templates/supervisord/api.conf → ...eedos/templates/supervisord/builder6.conf
@@ -1,5 +1,5 @@
-[program:api]
-directory=/app/
+[program:builder6]
+directory=/opt/steedos/builder6/
 command=/opt/steedos/run-with-env.sh /opt/steedos/builder6/startup.sh
 priority=15
 autostart=true

diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.15-beta.15",
-    "@steedos/objectql": "2.7.15-beta.15",
-    "@steedos/service-package-loader": "2.7.15-beta.15",
+    "@steedos/accounts": "2.7.15-beta.16",
+    "@steedos/objectql": "2.7.15-beta.16",
+    "@steedos/service-package-loader": "2.7.15-beta.16",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.15-beta.15"
+  "version": "2.7.15-beta.16"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,7 +29,7 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/utils": "2.7.15-beta.15",
+    "@steedos/utils": "2.7.15-beta.16",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "1.19.0",
@@ -56,20 +56,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.7.15-beta.15",
-    "@steedos/meteor-bundle-runner": "2.7.15-beta.15",
-    "@steedos/objectql": "2.7.15-beta.15",
+    "@steedos/auth": "2.7.15-beta.16",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.16",
+    "@steedos/objectql": "2.7.15-beta.16",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.7.15-beta.15",
+    "steedos-server": "2.7.15-beta.16",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,9 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.15-beta.15",
-    "@steedos/objectql": "2.7.15-beta.15",
-    "@steedos/utils": "2.7.15-beta.15",
+    "@steedos/cachers": "2.7.15-beta.16",
+    "@steedos/objectql": "2.7.15-beta.16",
+    "@steedos/utils": "2.7.15-beta.16",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.7.15-beta.15",
-    "@steedos/metadata-registrar": "2.7.15-beta.15",
+    "@steedos/metadata-core": "2.7.15-beta.16",
+    "@steedos/metadata-registrar": "2.7.15-beta.16",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.15-beta.15",
+    "@steedos/filters": "2.7.15-beta.16",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.15-beta.15",
-    "@steedos/filters": "2.7.15-beta.15",
-    "@steedos/i18n": "2.7.15-beta.15",
-    "@steedos/metadata-core": "2.7.15-beta.15",
-    "@steedos/migrate": "2.7.15-beta.15",
-    "@steedos/objectql": "2.7.15-beta.15",
-    "@steedos/odata-v4-mongodb": "2.7.15-beta.15",
-    "@steedos/process": "2.7.15-beta.15",
-    "@steedos/standard-objects": "2.7.15-beta.15",
+    "@steedos/auth": "2.7.15-beta.16",
+    "@steedos/filters": "2.7.15-beta.16",
+    "@steedos/i18n": "2.7.15-beta.16",
+    "@steedos/metadata-core": "2.7.15-beta.16",
+    "@steedos/migrate": "2.7.15-beta.16",
+    "@steedos/objectql": "2.7.15-beta.16",
+    "@steedos/odata-v4-mongodb": "2.7.15-beta.16",
+    "@steedos/process": "2.7.15-beta.16",
+    "@steedos/standard-objects": "2.7.15-beta.16",
     "body-parser": "^1.18.1",
     "bunyan-sfdx-no-dtrace": "^1.8.2",
     "clone": "^2.1.2",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@salesforce/kit": "1.0.4",
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/meteor-bundle-runner": "2.7.15-beta.15",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.16",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/create-steedos-package/package.json b/packages/create-steedos-package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-package",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }
diff --git a/packages/data-import/package.json b/packages/data-import/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@steedos/data-import",
-  "version": "2.7.15-beta.15",
+  "version": "2.7.15-beta.16",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.15-beta.15",
-    "@steedos/metadata-api": "2.7.15-beta.15",
-    "@steedos/metadata-core": "2.7.15-beta.15",
-    "@steedos/objectql": "2.7.15-beta.15",
+    "@steedos/core": "2.7.15-beta.16",
+    "@steedos/metadata-api": "2.7.15-beta.16",
+    "@steedos/metadata-core": "2.7.15-beta.16",
+    "@steedos/objectql": "2.7.15-beta.16",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22168fb9d7a00286bfebc9d02f9fd0339bb43338"
+  "gitHead": "0b1b62c7c03d62de3469a6fb0e4a1f77d38a4e21"
 }