-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix docker file * fix ci * add docker ci * update change log
- Loading branch information
1 parent
af06ae8
commit 435d124
Showing
19 changed files
with
382 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| name: WeDPR-Component docker ci | ||
| on: | ||
| push: | ||
| paths-ignore: | ||
| - "docs/**" | ||
| - "Changelog.md" | ||
| - "README.md" | ||
| tags: | ||
| - 'v3.*.*' | ||
| pull_request: | ||
| paths-ignore: | ||
| - "docs/**" | ||
| - "python/**" | ||
| - "Changelog.md" | ||
| - "README.md" | ||
| release: | ||
| types: [prereleased] | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| RUST_BACKTRACE: 1 | ||
| ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true | ||
| ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION: node16 | ||
| ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 | ||
| # Use docker.io for Docker Hub if empty | ||
| REGISTRY: ghcr.io | ||
|
|
||
| jobs: | ||
| build-docker: | ||
| if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| - name: Get branch name | ||
| uses: nelonoel/[email protected] | ||
| - name: Fetch tag | ||
| run: | | ||
| git fetch --tags --force | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 | ||
| with: | ||
| registry: ${{ env.REGISTRY }} | ||
| username: ${{ secrets.DOCKER_FISCOPR_USER }} | ||
| password: ${{ secrets.DOCKER_FISCOPR_TOKEN }} | ||
| - name: Get git tag | ||
| uses: little-core-labs/[email protected] | ||
| id: tag_data | ||
| with: | ||
| tagRegex: (.*) # Optional. Returns specified group text as tag name. Full tag string is returned if regex is not defined. | ||
| tagRegexGroup: 1 # Optional. Default is 1. | ||
| # the model image | ||
| - name: Build and Push model images | ||
| run: | | ||
| [[ ${{github.ref}} == */tags/* ]] && MODEL_DOCKER_TAG="${GIT_TAG_NAME}" || MODEL_DOCKER_TAG="${BRANCH_NAME}" | ||
| MODEL_DOCKER_TAG="fiscoorg/wedpr-model-service:${MODEL_DOCKER_TAG}" | ||
| echo "* Begin to build model docker: ${MODEL_DOCKER_TAG}" | ||
| cd docker-files/model/model | ||
| docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} -t ${MODEL_DOCKER_TAG} . | ||
| echo "* Build model docker: ${MODEL_DOCKER_TAG} success" | ||
| docker push ${MODEL_DOCKER_TAG} | ||
| echo "* Push model docker: ${MODEL_DOCKER_TAG} success" | ||
| # the wedpr-gateway-service image | ||
| - name: Build and Push wedpr-gateway-service images | ||
| run: | | ||
| [[ ${{github.ref}} == */tags/* ]] && GW_DOCKER_TAG="${GIT_TAG_NAME}" || GW_DOCKER_TAG="${BRANCH_NAME}" | ||
| GW_DOCKER_TAG="fiscoorg/wedpr-gateway-service:${GW_DOCKER_TAG}" | ||
| echo "* Begin to build wedpr-gateway-service docker: ${GW_DOCKER_TAG}" | ||
| cd docker-files/cpp/ | ||
| docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} --target wedpr-gateway-service -t ${GW_DOCKER_TAG} . | ||
| echo "* Build wedpr-gateway-service docker: ${GW_DOCKER_TAG} success" | ||
| docker push ${GW_DOCKER_TAG} | ||
| echo "* Push wedpr-gateway-service docker: ${GW_DOCKER_TAG} success" | ||
| # the wedpr-pro-node-service image | ||
| - name: Build and Push wedpr-pro-node-service images | ||
| run: | | ||
| [[ ${{github.ref}} == */tags/* ]] && NODE_DOCKER_TAG="${GIT_TAG_NAME}" || NODE_DOCKER_TAG="${BRANCH_NAME}" | ||
| NODE_DOCKER_TAG="fiscoorg/wedpr-pro-node-service:${NODE_DOCKER_TAG}" | ||
| echo "* Begin to build wedpr-pro-node-service docker: ${NODE_DOCKER_TAG}" | ||
| cd docker-files/cpp/ | ||
| docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} --target wedpr-pro-node-service -t ${NODE_DOCKER_TAG} . | ||
| echo "* Build wedpr-pro-node-service docker: ${NODE_DOCKER_TAG} success" | ||
| docker push ${NODE_DOCKER_TAG} | ||
| echo "* Push wedpr-pro-node-service docker: ${NODE_DOCKER_TAG} success" | ||
| # the wedpr-mpc-service image | ||
| - name: Build and Push wedpr-mpc-service images | ||
| run: | | ||
| [[ ${{github.ref}} == */tags/* ]] && MPC_DOCKER_TAG="${GIT_TAG_NAME}" || MPC_DOCKER_TAG="${BRANCH_NAME}" | ||
| MPC_DOCKER_TAG="fiscoorg/wedpr-mpc-service:${MPC_DOCKER_TAG}" | ||
| echo "* Begin to build wedpr-mpc-service docker: ${MPC_DOCKER_TAG}" | ||
| cd docker-files/cpp/ | ||
| docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} --target wedpr-mpc-service -t ${MPC_DOCKER_TAG} . | ||
| echo "* Build wedpr-mpc-service docker: ${MPC_DOCKER_TAG} success" | ||
| docker push ${MPC_DOCKER_TAG} | ||
| echo "* Push wedpr-mpc-service docker: ${MPC_DOCKER_TAG} success" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| name: Manual trigger wedpr-model-service-base-image docker image build | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| logLevel: | ||
| description: 'Log level' | ||
| required: true | ||
| default: 'warning' | ||
| tags: | ||
| description: 'the input tag' | ||
|
|
||
| jobs: | ||
| manual-build-model-base-docker: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| - name: Get branch name | ||
| uses: nelonoel/[email protected] | ||
| - name: Fetch tag | ||
| run: | | ||
| git fetch --tags --force | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| username: ${{ secrets.DOCKER_FISCOPR_USER }} | ||
| password: ${{ secrets.DOCKER_FISCOPR_TOKEN }} | ||
|
|
||
| # the model image | ||
| - name: Build and Push wedpr-model-service-base-image images | ||
| run: | | ||
| echo "* Manual build wedpr-model-service-base-image image, docker version: ${{ github.event.inputs.tags }}" | ||
| DOCKER_TAG="fiscoorg/wedpr-model-service-base-image:${{ github.event.inputs.tags }}" | ||
| echo "* Begin to build ${DOCKER_TAG}" | ||
| cd docker-files/model/base | ||
| docker build -t ${DOCKER_TAG} . | ||
| echo "* Build ${DOCKER_TAG} success" | ||
| docker push ${DOCKER_TAG} | ||
| echo "* Push ${DOCKER_TAG} success" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Manual trigger vcpkg-cache docker image build | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| logLevel: | ||
| description: 'Log level' | ||
| required: true | ||
| default: 'warning' | ||
| tags: | ||
| description: 'the input tag' | ||
|
|
||
| jobs: | ||
| manual-build-vcpkg-cache-docker: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| - name: Get branch name | ||
| uses: nelonoel/[email protected] | ||
| - name: Fetch tag | ||
| run: | | ||
| git fetch --tags --force | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| username: ${{ secrets.DOCKER_FISCOPR_USER }} | ||
| password: ${{ secrets.DOCKER_FISCOPR_TOKEN }} | ||
|
|
||
| # the model image | ||
| - name: Build and Push wedpr-component-vcpkg-cache images | ||
| run: | | ||
| echo "* Manual build wedpr-component-vcpkg-cache image, docker version: ${{ github.event.inputs.tags }}" | ||
| DOCKER_TAG="fiscoorg/wedpr-component-vcpkg-cache:${{ github.event.inputs.tags }}" | ||
| echo "* Begin to build ${DOCKER_TAG}" | ||
| cd docker-files/cpp/vcpkg | ||
| docker build --build-arg SOURCE_BRANCH=${BRANCH_NAME} -t ${DOCKER_TAG} . | ||
| echo "* Build ${DOCKER_TAG} success" | ||
| docker push ${DOCKER_TAG} | ||
| echo "* Push ${DOCKER_TAG} success" | ||
| - name: Publish Error | ||
| if: always() | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: autoconf-x64-linux-err.log | ||
| path: /WeDPR-Component/cpp/vcpkg/buildtrees/gsasl/autoconf-x64-linux-err.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,37 @@ | ||
| ### 1.0.0-rc1 | ||
| (2024-08-21) | ||
| # 3.0.0 | ||
| (2024-12-9) | ||
|
|
||
| **新增** | ||
| ### 新增 | ||
|
|
||
| #### 隐私计算组件 | ||
| **隐私计算组件** | ||
|
|
||
| - **PSI**: 实现多种类型隐私求交集算法，包括CM2020, RA2018, ECDH-PSI, ECDH-Multi-PSI等 | ||
| - **MPC**: 安全多方计算相关组件 | ||
| - **MPCSQL**: 基于安全多方计算协议，支持联合分析查询任务 | ||
| - **PIR**: 匿踪查询组件 | ||
| - PSI: 实现多种类型隐私求交集算法，包括CM2020, RA2018, ECDH-PSI, ECDH-Multi-PSI等 | ||
| - MPC: 安全多方计算 | ||
| - PIR: 匿踪查询核心组件 | ||
|
|
||
| #### 隐私计算互联互通 | ||
| **联合建模组件** | ||
|
|
||
| - ECDH PSI算法与隐语互联互通 | ||
| - 2+方的多方联合XGB/LR建模组件（训练 + 离线预测） | ||
| - 2+方多方特征工程组件（特征分箱，WOE/IV计算等） | ||
| - 多方数据预处理组件 | ||
|
|
||
| #### 隐私建模组件 | ||
| **统一网关** | ||
|
|
||
| - 支持基于最短路径的消息路由转发 | ||
| - 支持按节点ID、服务名、机构名进行路由寻址 | ||
| - 支持服务注册和服务发现 | ||
|
|
||
| **统一网关SDK** | ||
|
|
||
| - 提供Java/Python网关SDK，支持接入网关与其他节点、服务或者机构进行通信 | ||
| - 可向网关注册服务 | ||
| - 可从网关拉取服务信息 | ||
|
|
||
| **专家模式SDK** | ||
|
|
||
| - `wedpr-ml-toolkit`: 可通过python sdk向WeDPR隐私计算平台发起各类任务，并获取对应的结果，扩展了WeDPR隐私计算系统功能的可扩展性，可在不侵入式修改系统的前提下，实现数据开发人员的各类数据分析需求 | ||
|
|
||
| **密码学组件** | ||
|
|
||
| - 实现了各种同态算法，包括`Paillier`, `IHC`等 | ||
|
|
||
| - 2+方的多方联合XGB组件（训练 + 离线预测） | ||
| - 2+方多方特征工程组件（特征分箱，WOE/IV计算等） | ||
| - 预处理组件 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| set(VERSION "1.0.0") | ||
| set(PYTHON_TOOLKIT_VERSION "1.0.0") | ||
| set(VERSION "3.0.0") | ||
| set(PYTHON_TOOLKIT_VERSION "3.0.0") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.