chore: fix aliyun sync (#367)

* chore: fix aliyun sync * chore: fix skopeo sync image
apecloud · Jul 17, 2024 · e5c8bb6 · e5c8bb6
1 parent 9ae6f6a
commit e5c8bb6
Show file tree

Hide file tree

Showing 13 changed files with 205 additions and 66 deletions.
diff --git a/.github/actions/image-sync-auth-apecloud.yml b/.github/actions/image-sync-auth-apecloud.yml
@@ -0,0 +1,6 @@
+docker.io:
+  username: "${DOCKER_USER}"
+  password: "${DOCKER_PASSWORD}"
+apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com:
+  username: "${ALIYUN_USER}"
+  password: "${ALIYUN_PASSWORD}"
diff --git a/.github/actions/image-sync-auth-new.yml b/.github/actions/image-sync-auth-new.yml
diff --git a/.github/utils/utils.sh b/.github/utils/utils.sh
@@ -643,19 +643,18 @@ EOF
     done
 }
 
-generate_image_yaml_new() {
+generate_image_yaml_apecloud() {
     if [[ -z "$IMAGES" ]]; then
         echo "images name is empty"
         return
     fi
-    image_sync_yaml="./image_sync_yaml_new.yml"
+    image_sync_yaml="./image_sync_yaml_apecloud.yml"
     rm -f $image_sync_yaml
     touch $image_sync_yaml
     for image in `echo "$IMAGES" | sed 's/|/ /g'`; do
         image_name=${image##*/}
         tee -a $image_sync_yaml << EOF
 ${REGISTRY}/${image}:
-  - "infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/${image_name}"
   - "apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/${image_name}"
 EOF
     done
@@ -997,7 +996,7 @@ main() {
             check_release_version
         ;;
         32)
-            generate_image_yaml_new
+            generate_image_yaml_apecloud
         ;;
         33)
             set_label

diff --git a/.github/workflows/release-image-amd-sync.yml b/.github/workflows/release-image-amd-sync.yml
@@ -186,12 +186,35 @@ jobs:
 
       - name: generate image yaml
         run: |
-          bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
-            --type 27 \
-            --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
-            --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 27 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          else
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 32 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          fi
+
+      - uses: hhyasdf/[email protected]
+        name: sync image to apecloud aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && (env.ALIYUN_USER_NEW == '' || env.ALIYUN_PASSWORD_NEW == '') }}
+        with:
+          auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth-apecloud.yml
+          images_file: ./image_sync_yaml_apecloud.yml
+          proc: 6
+          retries: 5
+          version: v1.5.2
+        env:
+          DOCKER_USER: ${{ env.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+          ALIYUN_USER: ${{ env.ALIYUN_USER }}
+          ALIYUN_PASSWORD: ${{ env.ALIYUN_PASSWORD }}
 
       - uses: hhyasdf/[email protected]
+        name: sync image to all aliyun registry
         if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
         with:
           auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth.yml

diff --git a/.github/workflows/release-image-arm-sync.yml b/.github/workflows/release-image-arm-sync.yml
@@ -185,12 +185,35 @@ jobs:
 
       - name: generate image yaml
         run: |
-          bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
-            --type 27 \
-            --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
-            --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 27 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          else
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 32 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          fi
+
+      - uses: hhyasdf/[email protected]
+        name: sync image to apecloud aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && (env.ALIYUN_USER_NEW == '' || env.ALIYUN_PASSWORD_NEW == '') }}
+        with:
+          auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth-apecloud.yml
+          images_file: ./image_sync_yaml_apecloud.yml
+          proc: 6
+          retries: 5
+          version: v1.5.2
+        env:
+          DOCKER_USER: ${{ env.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+          ALIYUN_USER: ${{ env.ALIYUN_USER }}
+          ALIYUN_PASSWORD: ${{ env.ALIYUN_PASSWORD }}
 
       - uses: hhyasdf/[email protected]
+        name: sync image to all aliyun registry
         if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
         with:
           auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth.yml

diff --git a/.github/workflows/release-image-cache-amd-sync.yml b/.github/workflows/release-image-cache-amd-sync.yml
@@ -186,12 +186,35 @@ jobs:
 
       - name: generate image yaml
         run: |
-          bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
-            --type 27 \
-            --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
-            --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 27 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          else
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 32 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          fi
+
+      - uses: hhyasdf/[email protected]
+        name: sync image to apecloud aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && (env.ALIYUN_USER_NEW == '' || env.ALIYUN_PASSWORD_NEW == '') }}
+        with:
+          auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth-apecloud.yml
+          images_file: ./image_sync_yaml_apecloud.yml
+          proc: 6
+          retries: 5
+          version: v1.5.2
+        env:
+          DOCKER_USER: ${{ env.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+          ALIYUN_USER: ${{ env.ALIYUN_USER }}
+          ALIYUN_PASSWORD: ${{ env.ALIYUN_PASSWORD }}
 
       - uses: hhyasdf/[email protected]
+        name: sync image to all aliyun registry
         if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
         with:
           auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth.yml

diff --git a/.github/workflows/release-image-cache-sync.yml b/.github/workflows/release-image-cache-sync.yml
@@ -215,12 +215,35 @@ jobs:
 
       - name: generate image yaml
         run: |
-          bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
-            --type 27 \
-            --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
-            --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 27 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          else
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 32 \
+                --images "${{ inputs.IMG }}:${{ needs.release-image.outputs.tag-name }}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          fi
+
+      - uses: hhyasdf/[email protected]
+        name: sync image to apecloud aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && (env.ALIYUN_USER_NEW == '' || env.ALIYUN_PASSWORD_NEW == '') }}
+        with:
+          auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth-apecloud.yml
+          images_file: ./image_sync_yaml_apecloud.yml
+          proc: 6
+          retries: 5
+          version: v1.5.2
+        env:
+          DOCKER_USER: ${{ env.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+          ALIYUN_USER: ${{ env.ALIYUN_USER }}
+          ALIYUN_PASSWORD: ${{ env.ALIYUN_PASSWORD }}
 
       - uses: hhyasdf/[email protected]
+        name: sync image to all aliyun registry
         if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
         with:
           auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth.yml

diff --git a/.github/workflows/release-image-sync.yml b/.github/workflows/release-image-sync.yml
@@ -367,16 +367,40 @@ jobs:
                   ;;
               esac
           fi
-          bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
-            --type 32 \
-            --images "${IMAGES_INPUT}" \
-            --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 27 \
+                --images "${IMAGES_INPUT}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          else
+              bash ${{ github.workspace }}/apecloud-cd/.github/utils/utils.sh \
+                --type 32 \
+                --images "${IMAGES_INPUT}" \
+                --registry "${{ env.DOCKER_REGISTRY_URL }}"
+          fi
+
+      - uses: hhyasdf/[email protected]
+        name: sync image to apecloud aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && (env.ALIYUN_USER_NEW == '' || env.ALIYUN_PASSWORD_NEW == '') }}
+        with:
+          auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth-apecloud.yml
+          images_file: ./image_sync_yaml_apecloud.yml
+          proc: 6
+          retries: 5
+          version: v1.5.2
+        env:
+          DOCKER_USER: ${{ env.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ env.DOCKER_PASSWORD }}
+          ALIYUN_USER: ${{ env.ALIYUN_USER }}
+          ALIYUN_PASSWORD: ${{ env.ALIYUN_PASSWORD }}
 
       - uses: hhyasdf/[email protected]
-        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
+        name: sync image to all aliyun registry
+        if: ${{ env.DOCKER_USER != '' && env.DOCKER_PASSWORD != '' && env.ALIYUN_USER != '' && env.ALIYUN_PASSWORD != '' && env.ALIYUN_USER_NEW != '' && env.ALIYUN_PASSWORD_NEW != '' }}
         with:
           auth_file: ${{ github.workspace }}/apecloud-cd/.github/actions/image-sync-auth.yml
-          images_file: ./image_sync_yaml_new.yml
+          images_file: ./image_sync_yaml.yml
           proc: 6
           retries: 5
           version: v1.5.2

diff --git a/.github/workflows/skopeo-copy-images-aliyun.yml b/.github/workflows/skopeo-copy-images-aliyun.yml
@@ -17,6 +17,10 @@ run-name: copy to aliyun:${{ github.event.inputs.images_name }}
 env:
   DOCKER_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+  ALIYUN_USER: ${{ secrets.ALIYUN_REGISTRY_USER }}
+  ALIYUN_PASSWORD: ${{ secrets.ALIYUN_REGISTRY_PASSWORD }}
+  ALIYUN_USER_NEW: ${{ secrets.ALIYUN_USER_NEW }}
+  ALIYUN_PASSWORD_NEW: ${{ secrets.ALIYUN_PASSWORD_NEW }}
 
 jobs:
   script:
@@ -35,15 +39,17 @@ jobs:
           fi
           
           bash ${{ github.workspace }}/.github/utils/skopeo_copy_to_aliyun.sh \
-              "${{ secrets.ALIYUN_REGISTRY_USER }}" \
-              "${{ secrets.ALIYUN_REGISTRY_PASSWORD }}" \
+              "${{ env.ALIYUN_USER }}" \
+              "${{ env.ALIYUN_PASSWORD }}" \
               ${{ github.workspace }}/.github/utils/images-list.txt \
               "${{ inputs.registry }}" \
               '${{ secrets.ECR_PASSWORD }}'
           
-          bash ${{ github.workspace }}/.github/utils/skopeo_copy_to_aliyun_new.sh \
-              "${{ secrets.ALIYUN_USER_NEW }}" \
-              "${{ secrets.ALIYUN_PASSWORD_NEW }}" \
-              ${{ github.workspace }}/.github/utils/images-list.txt \
-              "${{ inputs.registry }}" \
-              '${{ secrets.ECR_PASSWORD }}'
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/.github/utils/skopeo_copy_to_aliyun_new.sh \
+                  "${{ env.ALIYUN_USER_NEW }}" \
+                  "${{ env.ALIYUN_PASSWORD_NEW }}" \
+                  ${{ github.workspace }}/.github/utils/images-list.txt \
+                  "${{ inputs.registry }}" \
+                  '${{ secrets.ECR_PASSWORD }}'
+          fi
diff --git a/.github/workflows/skopeo-copy-images-docker.yml b/.github/workflows/skopeo-copy-images-docker.yml
@@ -35,8 +35,8 @@ jobs:
           fi
           
           bash ${{ github.workspace }}/.github/utils/skopeo_copy_to_docker.sh \
-              "${{ secrets.DOCKER_REGISTRY_USER }}" \
-              '${{ secrets.DOCKER_REGISTRY_PASSWORD }}' \
+              "${{ env.DOCKER_USER }}" \
+              '${{ env.DOCKER_PASSWORD }}' \
               ${{ github.workspace }}/.github/utils/images-list.txt \
               "${{ inputs.registry }}" \
               '${{ secrets.ECR_PASSWORD }}'
diff --git a/.github/workflows/skopeo-sync-images-aliyun-to-aliyun.yml b/.github/workflows/skopeo-sync-images-aliyun-to-aliyun.yml
@@ -14,6 +14,12 @@ on:
 
 run-name: sync to aliyun:${{ github.event.inputs.images_name }}
 
+env:
+  ALIYUN_USER: ${{ secrets.ALIYUN_REGISTRY_USER }}
+  ALIYUN_PASSWORD: ${{ secrets.ALIYUN_REGISTRY_PASSWORD }}
+  ALIYUN_USER_NEW: ${{ secrets.ALIYUN_USER_NEW }}
+  ALIYUN_PASSWORD_NEW: ${{ secrets.ALIYUN_PASSWORD_NEW }}
+
 jobs:
   script:
     runs-on: macos-latest
@@ -29,12 +35,11 @@ jobs:
                   --images "${{ github.event.inputs.images_name }}" \
                   --images-list ${{ github.workspace }}/.github/utils/images-list.txt
           fi
-
           
           bash ${{ github.workspace }}/.github/utils/skopeo_sync_aliyun_to_aliyun_new.sh \
-              "${{ secrets.ALIYUN_REGISTRY_USER }}" \
-              '${{ secrets.ALIYUN_REGISTRY_PASSWORD }}' \
-              "${{ secrets.ALIYUN_USER_NEW }}" \
-              "${{ secrets.ALIYUN_PASSWORD_NEW }}" \
+              "${{ env.ALIYUN_USER }}" \
+              '${{ env.ALIYUN_PASSWORD }}' \
+              "${{ env.ALIYUN_USER_NEW }}" \
+              "${{ env.ALIYUN_PASSWORD_NEW }}" \
               ${{ github.workspace }}/.github/utils/images-list.txt \
               "${{ inputs.registry }}"
diff --git a/.github/workflows/skopeo-sync-images-aliyun.yml b/.github/workflows/skopeo-sync-images-aliyun.yml
@@ -14,6 +14,15 @@ on:
 
 run-name: sync to aliyun:${{ github.event.inputs.images_name }}
 
+env:
+  DOCKER_USER: ${{ secrets.DOCKER_REGISTRY_USER }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+  ALIYUN_USER: ${{ secrets.ALIYUN_REGISTRY_USER }}
+  ALIYUN_PASSWORD: ${{ secrets.ALIYUN_REGISTRY_PASSWORD }}
+  ALIYUN_USER_NEW: ${{ secrets.ALIYUN_USER_NEW }}
+  ALIYUN_PASSWORD_NEW: ${{ secrets.ALIYUN_PASSWORD_NEW }}
+  ECR_PASSWORD: ${{ secrets.ECR_PASSWORD }}
+
 jobs:
   script:
     runs-on: macos-latest
@@ -31,19 +40,21 @@ jobs:
           fi
           
           bash ${{ github.workspace }}/.github/utils/skopeo_sync_to_aliyun.sh \
-              "${{ secrets.DOCKER_USER }}" \
-              '${{ secrets.DOCKER_PASSWORD }}' \
-              "${{ secrets.ALIYUN_REGISTRY_USER }}" \
-              "${{ secrets.ALIYUN_REGISTRY_PASSWORD }}" \
+              "${{ env.DOCKER_USER }}" \
+              '${{ env.DOCKER_PASSWORD }}' \
+              "${{ env.ALIYUN_USER }}" \
+              "${{ env.ALIYUN_PASSWORD }}" \
               ${{ github.workspace }}/.github/utils/images-list.txt \
               "${{ inputs.registry }}" \
-              '${{ secrets.ECR_PASSWORD }}'
+              '${{ env.ECR_PASSWORD }}'
           
-          bash ${{ github.workspace }}/.github/utils/skopeo_sync_to_aliyun_new.sh \
-              "${{ secrets.DOCKER_USER }}" \
-              '${{ secrets.DOCKER_PASSWORD }}' \
-              "${{ secrets.ALIYUN_USER_NEW }}" \
-              "${{ secrets.ALIYUN_PASSWORD_NEW }}" \
-              ${{ github.workspace }}/.github/utils/images-list.txt \
-              "${{ inputs.registry }}" \
-              '${{ secrets.ECR_PASSWORD }}'
+          if [[ -n "${{ env.ALIYUN_USER_NEW }}" && -n "${{ env.ALIYUN_PASSWORD_NEW }}" ]]; then
+              bash ${{ github.workspace }}/.github/utils/skopeo_sync_to_aliyun_new.sh \
+                  "${{ env.DOCKER_USER }}" \
+                  '${{ env.DOCKER_PASSWORD }}' \
+                  "${{ env.ALIYUN_USER_NEW }}" \
+                  "${{ env.ALIYUN_PASSWORD_NEW }}" \
+                  ${{ github.workspace }}/.github/utils/images-list.txt \
+                  "${{ inputs.registry }}" \
+                  '${{ env.ECR_PASSWORD }}'
+          fi