diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index f0de60645e9..f5ab0427080 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -35,8 +35,8 @@ jobs: - name: "Publish images to DockerHub based on java8" if: matrix.java == 8 env: - REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} + REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} run: | if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot" || [ "${{ github.ref_name }}" == "2.x" ]; then ./mvnw -T 4C clean package -Dimage.name=openjdk:8u342 -Pimage -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; @@ -48,8 +48,8 @@ jobs: - name: "Publish images to DockerHub based on java17" if: ${{ matrix.java == 17 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }} env: - REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }} + REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} run: | ./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2 -Pimage,release-image-based-on-java17 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; ./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2-slim -Pimage,release-image-based-on-java17-slim -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn; diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index dca04c4a4a8..f8b810a5496 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -97,6 +97,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] upgrade nacos client to 1.4.6 - [[#6147](https://github.com/apache/incubator-seata/pull/6147)] upgrade kafka-clients to 3.6.1 - [[#6340](https://github.com/apache/incubator-seata/pull/6340)] upgrade and tidy some dependencies +- [[#6349](https://github.com/apache/incubator-seata/pull/6349)] transfer dockerhub repo ### test: - [[#6081](https://github.com/apache/incubator-seata/pull/6081)] add `test-os.yml` for testing the OS diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 90b586ecb70..e171e074f9d 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -84,10 +84,11 @@ - [[#6327](https://github.com/apache/incubator-seata/pull/6327)] 兼容 integration.http 和 integration.http.Jakarta API - [[#6328](https://github.com/apache/incubator-seata/pull/6328)] 兼容 integration.grpc API - [[#6330](https://github.com/apache/incubator-seata/pull/6330)] 去除 mariadb API -- [[#6329](https://github.com/apache/incubator-seata/pull/6312)] 添加saga子组件的io.seata兼容性API +- [[#6329](https://github.com/apache/incubator-seata/pull/6312)] 添加 saga 子组件的 io.seata 兼容性 API - [[#6254](https://github.com/apache/incubator-seata/pull/6254)] 优化Hessian 序列化 - [[#6332](https://github.com/apache/incubator-seata/pull/6332)] 分发包中移除 mysql 依赖 -- [[#6343](https://github.com/apache/incubator-seata/pull/6343)] 兼容tm 模块和rm-datasource模块 +- [[#6343](https://github.com/apache/incubator-seata/pull/6343)] 兼容 TM 模块和 rm-datasource 模块 +- [[#6349](https://github.com/apache/incubator-seata/pull/6349)] 迁移 dockerhub 仓库 ### security: diff --git a/server/pom.xml b/server/pom.xml index 5cf1b1f0b15..6d16fd895e7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -336,7 +336,7 @@ - docker.io/seataio/seata-server + docker.io/apache/seata-server ${image.tags} ${REGISTRY_USERNAME}