Merge remote-tracking branch 'origin/2.5'

steedos · Sep 27, 2023 · 154ebba · 154ebba
2 parents 7dc498c + 5020ebb
commit 154ebba
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/.github/workflows/release-docker-enterprise.yml b/.github/workflows/release-docker-enterprise.yml
@@ -2,9 +2,12 @@ name: Release Docker EE
 
 on:
   workflow_run:
-    workflows: [Release NPM]
+    workflows: [Disabled-Release NPM]
     types:
       - completed
+  push:
+    branches:
+      - 'releases/**'
 
 jobs:
   docker:
@@ -17,25 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get branch names
-        id: branch-name
-        uses: tj-actions/[email protected]
-        with: 
-          strip_tag_prefix: v
-
-      - name: Get the current tag
-        if: steps.branch-name.outputs.is_tag == 'true'  # Replaces: startsWith(github.ref, 'refs/tags/')
+      - name: Set Current Version
         run: |
-          echo "${{ steps.branch-name.outputs.tag }}"
-    
-      - uses: nowsprinting/check-version-format-action@v3
-        id: version
-        with:
-          prefix: 'v'
-
-      - name: Check is stable
-        if: ${{ steps.version.outputs.is_stable != 'true' }}
-        run: exit 0
+          CURRENT_VERSION=$(node -p 'require("./lerna.json").version')
+          echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
         
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
@@ -52,9 +40,9 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=schedule
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern={{version}},value=v${CURRENT_VERSION}
+            type=semver,pattern={{major}}.{{minor}},value=v${CURRENT_VERSION}
+            type=semver,pattern={{major}},value=v${CURRENT_VERSION}
 
       - uses: docker/login-action@v1
         name: Login Docker Hub

diff --git a/deploy/enterprise/Dockerfile b/deploy/enterprise/Dockerfile
@@ -17,9 +17,7 @@ RUN curl -fsSL https://pgp.mongodb.com/server-4.4.asc | \
 RUN echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list
 
 RUN apt-get update \
-    && apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24 \
-    && apt-get autoremove --yes \
-    && apt-get clean -y
+    && apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24 
 
 # Install nginx && redis
 RUN apt-get update \

diff --git a/lerna.json b/lerna.json
@@ -9,5 +9,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.5.15-beta.4"
+  "version": "2.5.15-beta.5"
 }
diff --git a/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json b/services/service-package-registry/main/default/pages/steedos_packages_list.page.amis.json
@@ -17,6 +17,10 @@
         "switchPerPage": false,
         "bulkActions": [],
         "card": {
+          "itemAction": {
+            "actionType": "link",
+            "link": "/app/admin/steedos_packages/view/${_id}"
+          },
           "header": {
             "avatarText": "${label|split:/|last|substring:0:2|upperCase}",
             "avatarTextBackground": [
@@ -33,11 +37,11 @@
             "className": "bg-white",
             "title": "${label}@${version}",
             "subTitle": "$description",
-            "description": "<span class=\"bg-${status === 'enable' ? 'green': 'gray'}-300 border rounded-full px-2 py-0.5 mt-2 inline-block\">$_display.status</span> ${static && '<span>静态(不支持卸载、升级)</span>'}"
+            "description": "<span class=\"bg-${status === 'enable' ? 'green': 'gray'}-300 border rounded-full px-2 py-0.5 mt-2 inline-block\">$_display.status</span>"
           },
           "actions": [
             {
-              "label": "启用",
+              "label": "${uiSchema.actions.enable.label}",
               "disabledOn": "${status === 'enable'}",
               "onEvent": {
                 "click": {
@@ -52,7 +56,7 @@
               "id": "u:553d77aa3872"
             },
             {
-              "label": "停用",
+              "label": "${uiSchema.actions.disable.label}",
               "disabledOn": "${status !== 'enable'}",
               "onEvent": {
                 "click": {
@@ -88,6 +92,9 @@
   "id": "u:2775cd701d6a",
   "name": "page_test__c_list",
   "bodyClassName": "p-0",
+  "cssVars": {
+    "--text--muted-color": "#bebfc4"
+  },
   "css": {
     ".antd-Wrapper.steedos-object-table > .antd-Service": {
       "flex-grow": "1"
@@ -109,6 +116,15 @@
     },
     ".antd-Service.steedos-object-table .antd-Crud .antd-Cards .antd-Cards-body": {
       "margin": "0.25rem"
+    },
+    ".antd-Card-toolbar .ant-ribbon-wrapper": {
+      "position": "absolute",
+      "top": "-14px",
+      "right": "0"
+    },
+    ".antd-Crud .antd-Cards .antd-Card .antd-Card-title": {
+      "white-space": "break-spaces",
+      "word-break": "break-all"
     }
   }
 }