create-steedos-app 2.1.75 → 2.1.82

package/createSteedosApp.js

@@ -68,6 +68,7 @@ function createProject(name) {
       '.steedos/**',
       '!.steedos/node_modules/**',
       '.vscode/**',
+      '.scripts/**'
     ], projectDir, {
       parents: true,
       flat: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.1.75",
+  "version": "2.1.82",
   "keywords": [
     "steedos"
   ],
@@ -35,5 +35,5 @@
   "resolutions": {
     "**/chalk": "3.0.0"
   },
-  "gitHead": "a401ad5a817c9af26f21c37f528708ced98bcbe8"
+  "gitHead": "37d20586b08a6f8c88d6d1b60ddb92228260fdde"
 }

package/templates/default/.scripts/env.sh

@@ -0,0 +1,7 @@
+# replace ROOT_URL
+root_replacement="ROOT_URL=$(gp url 5000)"
+sed -i "/^ROOT_URL=*/c$root_replacement" .env.local
+
+# replace METADATA_SERVER
+meta_replacement="METADATA_SERVER=$(gp url 5000)"
+sed -i "/^METADATA_SERVER=*/c$meta_replacement" .env.local

package/templates/default/.scripts/setup.sh

@@ -2,12 +2,4 @@
 mkdir -p /workspace/mongodb/data/db
 
 # create .env.local
-cp .env .env.local
-
-# replace ROOT_URL
-root_replacement="ROOT_URL=$(gp url 5000)"
-sed -i "/^ROOT_URL=*/c$root_replacement" .env.local
-
-# replace METADATA_SERVER
-meta_replacement="METADATA_SERVER=$(gp url 5000)"
-sed -i "/^METADATA_SERVER=*/c$meta_replacement" .env.local
+cp .env .env.local

package/templates/default/Dockerfile

@@ -9,6 +9,7 @@ ADD steedos-app ./steedos-app/
 ADD package.json .
 ADD moleculer.config.js .
 ADD steedos-config.yml ./steedos-config.yml
+ADD .scripts ./.scripts/
 
 # RUN npm config set registry http://registry.npm.taobao.org/
 # RUN yarn config set registry http://registry.npm.taobao.org/
@@ -17,4 +18,4 @@ RUN yarn
 
 ENV NODE_ENV=production
 
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

package/templates/default/env

@@ -21,6 +21,7 @@ DEVELOPER_STANDARD_OBJECTS=
 DEFAULT_PACKAGE_PATH=
 STEEDOS_CLOUD_LOGO_URL=
 STEEDOS_CLOUD_LOGO_SQUARE_URL=
+STEEDOS_INSTANCES_STAT_SCHEDULE=
 
 # saas初始化工作区信息
 STEEDOS_CLOUD_API_KEY=

package/templates/default/gitpod.yml

@@ -1,4 +1,4 @@
-image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:latest
+image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:2.1
 
 # List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
 ports:
@@ -32,6 +32,7 @@ tasks:
     init: |
       yarn install
     command: |
+      sh ./.scripts/env.sh
       gp await-port 27017
       gp await-port 6379
       yarn start

package/templates/default/steedos-config.yml

@@ -61,6 +61,8 @@ cron:
   mailqueue_interval: 10000
   # push_interval: 1000
   webhookqueue_interval: 1000
+instances_stat:
+  schedule: ${STEEDOS_INSTANCES_STAT_SCHEDULE}
 dingtalk:
   api_Key: ${APIKEY}
   log_path: ${DING_LOGPATH}