Merge branch 'main' into feature/avoid-auplicate-grouping-or-strategies

.github/actions/docker-buildx-push/action.yaml

@@ -14,6 +14,14 @@ inputs:
     description: Token for the DockerHub account
     required: false
     default: ""
+  f2c-registry-user:
+    description: "User name of Fit2Cloud Docker Registry."
+    required: false
+    default: ""
+  f2c-registry-token:
+    description: "Token of Fit2Cloud Docker Registry."
+    required: false
+    default: ""
   push:
     description: Should push the docker image or not.
     required: false
@@ -37,6 +45,7 @@ runs:
         images: |
           ghcr.io/${{ github.repository_owner }}/${{ inputs.image-name }}
           halohub/${{ inputs.image-name }}
+          registry.fit2cloud.com/halo/${{ inputs.image-name }}
         tags: |
           type=schedule,pattern=nightly-{{date 'YYYYMMDD'}},enabled=${{ github.event_name == 'schedule' }}
           type=ref,event=branch,enabled=${{ github.event_name == 'push' }}
@@ -64,6 +73,13 @@ runs:
       with:
         username: ${{ inputs.dockerhub-user }}
         password: ${{ inputs.dockerhub-token }}
+    - name: Login to Fit2Cloud Docker Registry
+      if: inputs.f2c-registry-token != '' && github.event_name != 'pull_request'
+      uses: docker/login-action@v3
+      with:
+        registry: registry.fit2cloud.com
+        username: ${{ inputs.f2c-registry-user }}
+        password: ${{ inputs.f2c-registry-token }}
     - name: Build and push
       uses: docker/build-push-action@v5
       with:

.github/workflows/halo.yaml

@@ -98,6 +98,8 @@ jobs:
           ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           dockerhub-user: ${{ secrets.DOCKER_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_TOKEN }}
+          f2c-registry-user: ${{ secrets.F2C_REGISTRY_USER }}
+          f2c-registry-token: ${{ secrets.F2C_REGISTRY_TOKEN }}
           push: true
           platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
 

OWNERS

@@ -9,3 +9,4 @@ approvers:
 - ruibaby
 - guqing
 - JohnNiang
+- LIlGG

README.md

@@ -27,10 +27,16 @@
 
 ## 快速开始
 
+如果你的设备有 Docker 环境，可以使用以下命令快速启动一个 Halo 的体验环境：
+
 ```bash
-docker run -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 halohub/halo:2.19
+docker run -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 halohub/halo:2.20
 ```
 
+或者点击下方按钮使用 [Gitpod](https://gitpod.io/) 启动一个体验环境：
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/halo-sigs/gitpod-demo)
+
 以上仅作为体验使用，详细部署文档请查阅：<https://docs.halo.run/getting-started/install/docker-compose>
 
 ## 在线体验