From 4e101de8c7ef1bc852ae59b5f3e38d75d89cb816 Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Mon, 30 Dec 2024 19:35:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 8 ++++---- config.yaml | 4 ++-- hack/update-image.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 198e336e..90b9285d 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,7 +29,7 @@ jobs: - name: Login harbor uses: docker/login-action@v3 with: - registry: harbor.cloud.pixiuio.com + registry: ccr.ccs.tencentyun.com username: ${{ secrets.HARBOR_USERNAME }} password: ${{ secrets.HARBOR_PASSWORD }} @@ -43,6 +43,6 @@ jobs: VERSION=${{ env.COMMIT_HASH }}-${{ env.TIMESTAMP }} push: true tags: | - harbor.cloud.pixiuio.com/${{ secrets.HARBOR_PROJECT }}/pixiu:latest - harbor.cloud.pixiuio.com/${{ secrets.HARBOR_PROJECT }}/pixiu:v0.1 - harbor.cloud.pixiuio.com/${{ secrets.HARBOR_PROJECT }}/pixiu:${{ env.COMMIT_HASH }} + ccr.ccs.tencentyun.com/pixiucloud/pixiu:latest + ccr.ccs.tencentyun.com/pixiucloud/pixiu:v0.1 + ccr.ccs.tencentyun.com/pixiucloud/pixiu:${{ env.COMMIT_HASH }} diff --git a/config.yaml b/config.yaml index fa921d45..607bb027 100644 --- a/config.yaml +++ b/config.yaml @@ -26,12 +26,12 @@ mysql: worker: work_dir: /tmp/pixiu engines: - - image: harbor.cloud.pixiuio.com/pixiuio/kubez-ansible:v2.0.1 + - image: ccr.ccs.tencentyun.com/pixiucloud/kubez-ansible:v2.0.1 os_supported: - centos7 - debian10 - ubuntu18.04 - - image: harbor.cloud.pixiuio.com/pixiuio/kubez-ansible:v3.0.1 + - image: ccr.ccs.tencentyun.com/pixiucloud/kubez-ansible:v3.0.1 os_supported: - debian11 - ubuntu20.04 diff --git a/hack/update-image.sh b/hack/update-image.sh index 5ee5338b..c03aa757 100644 --- a/hack/update-image.sh +++ b/hack/update-image.sh @@ -1,9 +1,9 @@ #!/bin/bash function update() { - docker pull harbor.cloud.pixiuio.com/pixiuio/pixiu-aio:latest + docker ccr.ccs.tencentyun.com/pixiucloud/pixiu-aio:latest docker rm -f pixiu-aio sleep 3 - docker run -d --net host --restart=always --privileged=true -v /etc/pixiu:/etc/pixiu -v /var/run/docker.sock:/var/run/docker.sock --name pixiu-aio harbor.cloud.pixiuio.com/pixiuio/pixiu-aio:latest + docker run -d --net host --restart=always --privileged=true -v /etc/pixiu:/etc/pixiu -v /var/run/docker.sock:/var/run/docker.sock --name pixiu-aio ccr.ccs.tencentyun.com/pixiucloud/pixiu-aio:latest } update From c3fed90a7dd291de96ed5d5f38cc0dd1e8bd37c2 Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Mon, 30 Dec 2024 19:38:06 +0800 Subject: [PATCH 2/3] add --- .github/workflows/docker-image.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 90b9285d..c651a948 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,6 +7,10 @@ on: paths-ignore: - 'docs/**' + pull_request: + branches: + - master + jobs: build: runs-on: ubuntu-latest @@ -29,7 +33,7 @@ jobs: - name: Login harbor uses: docker/login-action@v3 with: - registry: ccr.ccs.tencentyun.com + registry: crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com username: ${{ secrets.HARBOR_USERNAME }} password: ${{ secrets.HARBOR_PASSWORD }} @@ -43,6 +47,6 @@ jobs: VERSION=${{ env.COMMIT_HASH }}-${{ env.TIMESTAMP }} push: true tags: | - ccr.ccs.tencentyun.com/pixiucloud/pixiu:latest - ccr.ccs.tencentyun.com/pixiucloud/pixiu:v0.1 - ccr.ccs.tencentyun.com/pixiucloud/pixiu:${{ env.COMMIT_HASH }} + crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:latest + crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:v0.1 + crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:${{ env.COMMIT_HASH }} From ba6b9a738f6ed137e146c405e4edce5073a027bd Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Mon, 30 Dec 2024 20:03:47 +0800 Subject: [PATCH 3/3] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c651a948..b8ed8a5f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,10 +7,6 @@ on: paths-ignore: - 'docs/**' - pull_request: - branches: - - master - jobs: build: runs-on: ubuntu-latest @@ -48,5 +44,5 @@ jobs: push: true tags: | crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:latest - crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:v0.1 + crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:v1.0.1 crpi-0ecikjs9ylb2hqyo.cn-hangzhou.personal.cr.aliyuncs.com/pixiu-public/pixiu:${{ env.COMMIT_HASH }}