No commit message

steedos · Dec 11, 2024 · 25bae61 · 25bae61
2 parents 1b72861 + 9b8e0e1
commit 25bae61
Show file tree

Hide file tree

Showing 94 changed files with 433 additions and 390 deletions.
diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile
@@ -11,11 +11,6 @@ RUN apt-get update || : && apt-get install -y \
     curl \
     build-essential 
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - 
-
-RUN apt-get update \
-    && apt-get install -y gnupg curl nodejs
-
 # Install MongoDB 4.4.25
 # https://www.mongodb.com/docs/v4.4/tutorial/install-mongodb-on-ubuntu/
 # https://github.com/docker-library/mongo/blob/66197d92be6eafc0a36b2570172de0a5f7a905e1/4.4/Dockerfile
@@ -47,8 +42,21 @@ RUN apt-get update \
     && apt-get remove -y git python3-pip python3-venv \
     && apt-get clean -y
 
-# yarn 
 
+# 安装 nvm 并安装 Node.js
+ENV NVM_DIR=/root/.nvm
+
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
+    && chmod +x "$NVM_DIR/nvm.sh" \
+    && bash -c ". $NVM_DIR/nvm.sh && nvm install 14.21.3 && nvm install 20.18.1 && nvm alias default 14.21.3"
+
+# 确保在构建过程中可用
+ENV PATH=$NVM_DIR/versions/node/v14.21.3/bin:$PATH
+
+RUN apt-get update \
+    && apt-get install -y gnupg curl nodejs
+
+# yarn 
 RUN npm install --global yarn
 
 # platform
@@ -81,6 +89,14 @@ WORKDIR /opt/steedos/nodered
 
 RUN yarn && yarn cache clean
 
+# plugins
+COPY ./app/plugins /opt/steedos/plugins
+WORKDIR /opt/steedos/plugins
+
+RUN bash -c ". $NVM_DIR/nvm.sh && nvm use 20 && npm i --production"
+
+RUN bash -c ". $NVM_DIR/nvm.sh && nvm use 14"
+
 COPY ./fs /
 
 # Remove cached files

diff --git a/deploy/enterprise/app/platform/package.json b/deploy/enterprise/app/platform/package.json
@@ -10,7 +10,6 @@
   },
   "dependencies": {
     "lerna": "^4.0.0",
-    "@builder6/mongodb-api": "^0.0.8",
     "@steedos-labs/analytics": "^0.1.32",
     "@steedos/service-community": "~2.7",
     "@steedos/service-enterprise": "^2.5"

diff --git a/deploy/enterprise/app/plugins/package.json b/deploy/enterprise/app/plugins/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "steedos-plugins",
+  "version": "0.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "@builder6/mongodb-api": "^0.0.9"
+  }
+}
diff --git a/deploy/enterprise/app/plugins/startup.sh b/deploy/enterprise/app/plugins/startup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# 加载 nvm 环境
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+# 获取 Node.js 20 的实际路径
+NODE_PATH=$(nvm which 20)
+
+if [ -z "$NODE_PATH" ]; then
+    echo "Error: Node.js 14 is not installed. Please install it with nvm."
+    exit 1
+fi
+
+# 切换到工作目录
+cd /opt/steedos/plugins || exit
+
+# 使用 Node.js 14 运行应用
+exec "$NODE_PATH" ./node_modules/@builder6/mongodb-api/dist/main.js
diff --git a/deploy/enterprise/fs/opt/steedos/templates/supervisord/api.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/api.conf
@@ -1,6 +1,6 @@
 [program:api]
 directory=/app/
-command=/opt/steedos/run-with-env.sh node ./node_modules/@builder6/mongodb-api/dist/main.js
+command=/opt/steedos/run-with-env.sh /opt/steedos/plugins/startup.sh
 priority=15
 autostart=true
 autorestart=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.12",
+  "version": "2.7.15-beta.1",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.12",
-    "@steedos/objectql": "2.7.12",
-    "@steedos/service-package-loader": "2.7.12",
+    "@steedos/accounts": "2.7.15-beta.1",
+    "@steedos/objectql": "2.7.15-beta.1",
+    "@steedos/service-package-loader": "2.7.15-beta.1",
     "@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": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.12"
+  "version": "2.7.15-beta.1"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "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.12",
+    "@steedos/utils": "2.7.15-beta.1",
     "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.12",
-    "@steedos/meteor-bundle-runner": "2.7.12",
-    "@steedos/objectql": "2.7.12",
+    "@steedos/auth": "2.7.15-beta.1",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.1",
+    "@steedos/objectql": "2.7.15-beta.1",
     "@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.12",
+    "steedos-server": "2.7.15-beta.1",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,9 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.12",
-    "@steedos/objectql": "2.7.12",
-    "@steedos/utils": "2.7.12",
+    "@steedos/cachers": "2.7.15-beta.1",
+    "@steedos/objectql": "2.7.15-beta.1",
+    "@steedos/utils": "2.7.15-beta.1",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "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.12",
-    "@steedos/metadata-registrar": "2.7.12",
+    "@steedos/metadata-core": "2.7.15-beta.1",
+    "@steedos/metadata-registrar": "2.7.15-beta.1",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.12",
+    "@steedos/filters": "2.7.15-beta.1",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.12",
-    "@steedos/filters": "2.7.12",
-    "@steedos/i18n": "2.7.12",
-    "@steedos/metadata-core": "2.7.12",
-    "@steedos/migrate": "2.7.12",
-    "@steedos/objectql": "2.7.12",
-    "@steedos/odata-v4-mongodb": "2.7.12",
-    "@steedos/process": "2.7.12",
-    "@steedos/standard-objects": "2.7.12",
+    "@steedos/auth": "2.7.15-beta.1",
+    "@steedos/filters": "2.7.15-beta.1",
+    "@steedos/i18n": "2.7.15-beta.1",
+    "@steedos/metadata-core": "2.7.15-beta.1",
+    "@steedos/migrate": "2.7.15-beta.1",
+    "@steedos/objectql": "2.7.15-beta.1",
+    "@steedos/odata-v4-mongodb": "2.7.15-beta.1",
+    "@steedos/process": "2.7.15-beta.1",
+    "@steedos/standard-objects": "2.7.15-beta.1",
     "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.12",
+    "@steedos/meteor-bundle-runner": "2.7.15-beta.1",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
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.12",
+  "version": "2.7.15-beta.1",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
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.12",
+  "version": "2.7.15-beta.1",
   "keywords": [
     "steedos"
   ],
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
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.12",
+  "version": "2.7.15-beta.1",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
     "build": "rm -rf ./lib && tsc"
   },
   "dependencies": {
-    "@steedos/core": "2.7.12",
-    "@steedos/metadata-api": "2.7.12",
-    "@steedos/metadata-core": "2.7.12",
-    "@steedos/objectql": "2.7.12",
+    "@steedos/core": "2.7.15-beta.1",
+    "@steedos/metadata-api": "2.7.15-beta.1",
+    "@steedos/metadata-core": "2.7.15-beta.1",
+    "@steedos/objectql": "2.7.15-beta.1",
     "bson": "4.6.4",
     "csvtojson": "~2.0.10",
     "dotenv-flow": "^3.1.0",
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }
diff --git a/packages/filters/package.json b/packages/filters/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.7.12",
+  "version": "2.7.15-beta.1",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "394a678828a01b9ba9c377b7f9afe8fa6b61f6a9"
+  "gitHead": "dec34c07bdc20df046be6d443a3dd9a4e5cc3d3d"
 }