diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5ed78ff1be3..38e524fb9e2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,7 +5,7 @@ env: POSTGRESQL_USR: postgres POSTGRESQL_PWD: root123 POSTGRESQL_DATABASE: registry - DOCKER_COMPOSE_VERSION: 1.23.0 + DOCKER_COMPOSE_VERSION: 2.27.0 HARBOR_ADMIN: admin HARBOR_ADMIN_PASSWD: Harbor12345 CORE_SECRET: tempString @@ -66,7 +66,7 @@ jobs: env #sudo apt install -y xvfb #xvfb-run ls - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin IP=`hostname -I | awk '{print $1}'` @@ -131,7 +131,7 @@ jobs: df -h #sudo apt install -y xvfb #xvfb-run ls - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin - name: install @@ -186,7 +186,7 @@ jobs: df -h #sudo apt install -y xvfb #xvfb-run ls - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin - name: install @@ -240,7 +240,7 @@ jobs: df -h #sudo apt install -y xvfb #xvfb-run ls - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin - name: install @@ -292,7 +292,7 @@ jobs: df -h #sudo apt install -y xvfb #xvfb-run ls - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + curl -L https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin IP=`hostname -I | awk '{print $1}'` diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index d3eafdaf33f..4977d13351c 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -286,9 +286,9 @@ "SCAN": "漏洞扫描", "AUTOSCAN_TOGGLE": "自动扫描镜像", "AUTOSCAN_POLICY": "当镜像上传后，自动进行扫描", - "SBOM": "SBOM generation", - "AUTOSBOM_TOGGLE": "Automatically generate SBOM on push", - "AUTOSBOM_POLICY": "Automatically generate SBOM when the images are pushed to the project registry." + "SBOM": "生成软件物料清单", + "AUTOSBOM_TOGGLE": "在推送镜像时自动生成软件物料清单", + "AUTOSBOM_POLICY": "在推送镜像时自动生成该镜像的软件物料清单（SBOM)。" }, "MEMBER": { "NEW_USER": "添加用户成员", @@ -405,7 +405,7 @@ "REPOSITORY": "仓库", "ARTIFACT": "Artifact", "SCAN": "扫描", - "SBOM": "SBOM", + "SBOM": "软件物料清单", "TAG": "Tag", "ACCESSORY": "附件", "ARTIFACT_ADDITION": "Artifact 额外信息", @@ -777,7 +777,7 @@ "ARTIFACTS": "Artifacts", "SIZE": "大小", "VULNERABILITY": "漏洞", - "SBOM": "SBOM", + "SBOM": "软件物料清单", "BUILD_HISTORY": "构建历史", "SIGNED": "已签名", "AUTHOR": "作者", @@ -1038,31 +1038,31 @@ "TOOLTIPS_TITLE_ZERO": "No recognizable SBOM detected" }, "GRID": { - "PLACEHOLDER": "No scan results found.", - "COLUMN_PACKAGE": "Package", - "COLUMN_PACKAGES": "Packages", - "COLUMN_VERSION": "Current version", - "COLUMN_LICENSE": "License", - "COLUMN_DESCRIPTION": "Description", + "PLACEHOLDER": "没有扫描结果.", + "COLUMN_PACKAGE": "软件包", + "COLUMN_PACKAGES": "软件包", + "COLUMN_VERSION": "当前版本", + "COLUMN_LICENSE": "许可证", + "COLUMN_DESCRIPTION": "描述", "FOOT_ITEMS": "Items", "FOOT_OF": "of" }, "STATE": { - "OTHER_STATUS": "No SBOM", + "OTHER_STATUS": "无软件物料清单", "QUEUED": "Queued", "ERROR": "View Log", "SCANNING": "Generating", "STOPPED": "Generation stopped" }, - "NO_SBOM": "No SBOM", + "NO_SBOM": "无软件物料清单", "PACKAGES": "SBOM", "COMPLETED": "Completed", "REPORTED_BY": "Reported by {{scanner}}", - "GENERATE": "Generate SBOM", - "DOWNLOAD": "Download SBOM", - "Details": "SBOM details", - "STOP": "Stop Generate SBOM", - "TRIGGER_STOP_SUCCESS": "Trigger stopping SBOM generation successfully" + "GENERATE": "生成软件物料清单", + "DOWNLOAD": "下载软件物料清单", + "Details": "软件物料清单详情", + "STOP": "停止生成软件物料清单", + "TRIGGER_STOP_SUCCESS": "成功触发停止执行" }, "VULNERABILITY": { "STATE": { @@ -1108,12 +1108,12 @@ "PLACEHOLDER": "过滤漏洞", "PACKAGE": "组件", "PACKAGES": "组件", - "SCAN_NOW": "Scan vulnerability", + "SCAN_NOW": "漏洞扫描", "SCAN_BY": "使用 {{scanner}} 进行扫描", "REPORTED_BY": "结果由 {{scanner}} 提供", "NO_SCANNER": "无扫描器", "TRIGGER_STOP_SUCCESS": "停止扫描成功", - "STOP_NOW": "Stop Scan Vulnerability" + "STOP_NOW": "停止漏洞扫描" }, "PUSH_IMAGE": { "TITLE": "推送命令", @@ -1469,10 +1469,10 @@ "NAME_REQUIRED": "名称为必填项", "NAME_REX": "名称由小写字符、数字和._-组成且至少2个字符并以字符或者数字开头。", "DESCRIPTION": "描述", - "SBOM": "SBOM", - "VULNERABILITY": "Vulnerability", - "SUPPORTED": "Supported", - "NOT_SUPPORTED": "Not Supported", + "SBOM": "软件物料清单", + "VULNERABILITY": "漏洞扫描", + "SUPPORTED": "支持", + "NOT_SUPPORTED": "不支持", "ENDPOINT": "地址", "ENDPOINT_EXISTS": "地址已存在", "ENDPOINT_REQUIRED": "地址为必填项",