Skip to content

Commit 92060a6

Browse files
haha-zwx-ooo雨土
authored andcommitted
repo-sync-2024-05-21T17:31:54+0800
1 parent 3e665d0 commit 92060a6

File tree

335 files changed

+7171
-4279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

335 files changed

+7171
-4279
lines changed

.circleci/config.yml

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
- checkout
3737
- setup_remote_docker
3838
- run:
39-
name: Build Docker image
40-
command: make image
39+
name: Build Jar
40+
command: make build
4141
- run:
4242
name: Push to Docker Hub
4343
command: |
@@ -47,14 +47,46 @@ jobs:
4747
docker login -u ${ALIYUN_DOCKER_USERNAME} -p ${ALIYUN_DOCKER_PASSWORD} secretflow-registry.cn-hangzhou.cr.aliyuncs.com
4848
CIRCLETAG=$(echo ${CIRCLE_TAG} | sed 's/v//')
4949
50-
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
51-
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:latest
52-
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
53-
docker tag $(docker images --format "{{.Repository}}:{{.Tag}}" | sed -n '1p') secretflow/secretpad:${CIRCLETAG}
54-
docker push secretflow/secretpad:${CIRCLETAG}
55-
docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}
56-
docker push secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest
57-
docker push secretflow/secretpad:latest
50+
BUILDER_EXISTS=$(
51+
docker buildx inspect secretpad_image_buildx >/dev/null 2>&1
52+
echo $?
53+
)
54+
55+
if [ "$BUILDER_EXISTS" -eq 0 ]; then
56+
echo "existing buildx builder: secretpad_image_buildx"
57+
docker buildx use secretpad_image_buildx
58+
else
59+
echo "creating new buildx builder: secretpad_image_buildx"
60+
docker buildx create --name secretpad_image_buildx --use
61+
fi
62+
63+
remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:latest"
64+
docker buildx build \
65+
--platform linux/arm64,linux/amd64 \
66+
--tag "${remote_image}" \
67+
-f ./build/Dockerfiles/anolis.Dockerfile . \
68+
--push
69+
70+
remote_image="secretflow/secretpad:latest"
71+
docker buildx build \
72+
--platform linux/arm64,linux/amd64 \
73+
--tag "${remote_image}" \
74+
-f ./build/Dockerfiles/anolis.Dockerfile . \
75+
--push
76+
77+
remote_image="secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad:${CIRCLETAG}"
78+
docker buildx build \
79+
--platform linux/arm64,linux/amd64 \
80+
--tag "${remote_image}" \
81+
-f ./build/Dockerfiles/anolis.Dockerfile . \
82+
--push
83+
84+
remote_image="secretflow/secretpad:${CIRCLETAG}"
85+
docker buildx build \
86+
--platform linux/arm64,linux/amd64 \
87+
--tag "${remote_image}" \
88+
-f ./build/Dockerfiles/anolis.Dockerfile . \
89+
--push
5890
5991
workflows:
6092
build-deploy:

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: secretpad Issue Template
2+
description: Thank you for reporting the issue!
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Please make sure that you report a code/doc bug, feature request or build/installation bug on GitHub.
8+
- type: dropdown
9+
id: issue-type
10+
attributes:
11+
label: Issue Type
12+
description: What type of issue would you like to report?
13+
multiple: false
14+
options:
15+
- Bug
16+
- Build/Install
17+
- Feature Request
18+
- Documentation Feature Request
19+
- Documentation Bug
20+
- Others
21+
validations:
22+
required: true
23+
- type: dropdown
24+
id: source
25+
attributes:
26+
label: Source
27+
description: Secretflow installed from
28+
options:
29+
- local
30+
- docker
31+
validations:
32+
required: true
33+
- type: input
34+
id: secretpadversion
35+
attributes:
36+
label: secretpad Version
37+
description:
38+
placeholder: e.g., secretpad 0.6.0b0
39+
validations:
40+
required: true
41+
- type: input
42+
id: kusciaversion
43+
attributes:
44+
label: kuscia Version
45+
description:
46+
placeholder: e.g., kuscia 0.7.0b0
47+
validations:
48+
required: true
49+
- type: input
50+
id: OS
51+
attributes:
52+
label: OS Platform and Distribution
53+
description:
54+
placeholder: e.g., Linux Ubuntu 18.04
55+
validations:
56+
required: true
57+
- type: textarea
58+
id: what-happened
59+
attributes:
60+
label: What happend and What you expected to happen.
61+
description: Describe the bug, exepcted behavior and relevant log output.
62+
placeholder: A bug happened!
63+
value:
64+
render: shell
65+
validations:
66+
required: true

.github/ISSUE_TEMPLATE/old-issue-template.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ secretpad-web/config
3838

3939
### VS Code ###
4040
.vscode/
41-
4241
tmp/
43-
db/
4442
log/
4543
config/certs
4644
config/server.jks
@@ -52,3 +50,11 @@ docs/_build
5250
/test/TEST-secretpad.xml
5351
/.jpb/
5452
/secretpad-common/src/test/resources/config/
53+
/secretflow-allinone-package/
54+
/secretflow-allinone-package-v0.6.0b0-36-g08b4e1cc.tar.gz
55+
/scripts/oss/secretflow-allinone-package/
56+
/scripts/oss/secretflow-allinone-package-v0.6.0b0-41-g9af69f63.tar.gz
57+
/secretpad-web/db/
58+
/db/secretpad.sqlite
59+
/db/secretpad.sqlite-shm
60+
/db/secretpad.sqlite-wal

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
`Fixed` for any bug fixes.
1515
`Security` in case of vulnerabilities.
1616

17+
## [0.7.0b0] - 2024-05-15
18+
19+
### Added
20+
21+
- [Feature] Secretpad arm & amd image builds, MVP package supports arm & amd.
22+
- [Feature] Canvas supports changes in SecretFlow 1.6.0: support for GLM model in pvalue evaluation, onehot encoding
23+
supports dropping the mode column, LR training components add an option to output weights, addition of vertical union
24+
operator for datasets, psi version upgrade, etc.
25+
- [Feature] Support for changes in kuscia.sh, watch job interface changes, arm changes, and other kuscia 0.8.0
26+
modifications.
27+
- [Feature] Canvas task parallel value configuration.
28+
- [Feature] Front-end display of Secretpad component versions.
29+
- [Feature] Integration with Alibaba Cloud SLS to display detailed logs of SLS components on the web interface.
30+
- [Feature] Secretpad version upgrade data retention.
31+
- [Feature] Serving online prediction release can specify system resources CPU, memory.
32+
- [Feature] Addition of platform component linear model parameter modification (currently supports modification of glm
33+
model).
34+
- [Documentation] Supplemental documentation for Secretpad and Secretpad frontend development.
35+
- [Documentation] Secretpad GitHub technical documentation covering deployment, usage, common issues, development.
36+
37+
### Changed
38+
39+
- [Optimization] Kuscia grpc-related code refactoring and optimization.
40+
- [Optimization] Adjustment and standardization of data initialization operations.
41+
- [Optimization] Optimization of unit test structure, log output content, and format.
42+
43+
### Security
44+
45+
- [Vulnerability] Fixes for CVE-2022-40897, CVE-2024-20952, CVE-2024-20932, CVE-2024-20918, CVE-2024-22262,
46+
CVE-2024-29025.
47+
1748
## [0.6.0b0] - 2024-04-15
1849

1950
### Added

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ docs: ## Build docs.
4242
cd docs && pip install -r requirements.txt && make html
4343

4444
.PHONY: pack
45+
platform="linux/amd64"
4546
pack: ## Build pack all in one with tar.gz.
46-
./scripts/pack/pack_allinone.sh
47+
./scripts/pack/pack_allinone.sh ${platform}

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,12 @@ For more details, see [Development](./docs/deployment_experience/v0.6.0b0/deploy
102102
103103
| secretpad Version | Kuscia Version | secretflow Version | trustedflow Version | serving Version |
104104
|-------------------|----------------|--------------------|---------------------|-----------------|
105+
| 0.7.0b0 | 0.8.0b0 | 1.6.0b0 | 0.1.1b0 | 0.3.0b0 |
105106
| 0.6.0b0 | 0.7.0b0 | 1.5.0b0 | 0.1.1b0 | 0.2.1b0 |
106107
| 0.5.0b0 | 0.6.0b0 | 1.4.0b0 | 0.1.1b0 | 0.2.0b0 |
107108
| 0.4.1b0 | 0.5.0b0 | 1.4.0.dev24011601 | 0.1.1b0 | |
108109
| 0.3.0b0 | 0.4.0b0 | 1.3.0.dev20231109 | 0.1.1b0 | |
109110

110-
## Development
111-
112-
Kuscia notls mode can realize remote access to the Kuscia GRPC service, but due to file service limitations, it will
113-
be unavailable in file upload and download, and other file data sources will be provided soon to achieve true extension
114-
deployment
115-
116-
- [IDEA develop locally](./docs/development/ru_in_idea_cn.md)
117-
- [Use mysql as the running database](./docs/development/SUPPORT_MYSQL.md)
118-
119111
## Contact
120112

121113
* [bilibili](https://space.bilibili.com/2073575923): secretflow bilibili account

0 commit comments

Comments
 (0)