GHCR和ACR都推送国内外镜像 (#34)

* ACR推送

* Revert "Merge pull request #1 from Zllinc/aliyunCI"

This reverts commit 95d623c, reversing
changes made to 609a69c.

* 国内外镜像都推送至ghcr和acr

* 镜像名转小写

* 测试所有分支

* 给get_all_dockerfile添加执行权限

* 修改Dockerfile用来测试

* 修改ACR镜像名称输出

* 修改ACR镜像输出名字

* main分支推送生效

* 不同镜像放到不同的ACR repo里

* 变量名错误修改

---------

Co-authored-by: Cunzili <[email protected]>

Author: Zllinc

.github/workflows/docker-image.yml

@@ -9,7 +9,7 @@ on:
         default: 'latest'
   push:
     branches:
-      - 'main'
+      - 'main' 
 jobs:
   define-matrix:
     runs-on: ubuntu-latest
@@ -67,17 +67,30 @@ jobs:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Build and push image
+    - name: Login to Aliyun ACR
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ secrets.ALIYUN_REGISTRY }}
+        username: ${{ secrets.ALIYUN_USERNAME }}
+        password: ${{ secrets.ALIYUN_PASSWORD }}
+    - name: Build and push images
       run: |
         echo "build_target=${{ matrix.build_target }}"
         echo "tag=${{ needs.define-matrix.outputs.tag }}"
+        ghcr_image_name=$(bash script/get_image_name.sh "ghcr.io" "${{ github.repository_owner }}" "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag }}" | tr '[:upper:]' '[:lower:]')
+        acr_image_name=$(bash script/get_image_name.sh "${{ secrets.ALIYUN_REGISTRY }}" "${{ secrets.ALIYUN_NAMESPACE }}" "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag }}" | tr '[:upper:]' '[:lower:]')
+        echo "ghcr_image_name=$ghcr_image_name" >> $GITHUB_OUTPUT
+        echo "acr_image_name=$acr_image_name" >> $GITHUB_OUTPUT
+        echo "Building and pushing both images..."
+        is_cn="0" bash script/build_and_push_images.sh "${{ matrix.build_target }}" "$ghcr_image_name" "$acr_image_name" $is_cn
+    - name: Build and push images_cn
+      run: |
+        echo "build_target=${{ matrix.build_target }}"
         echo "tag_cn=${{ needs.define-matrix.outputs.tag_cn }}"
-        image_name=$(bash script/get_image_name.sh ${{ github.repository_owner }} "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag }}")
-        image_name_cn=$(bash script/get_image_name.sh ${{ github.repository_owner }} "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag_cn }}")
-        echo "image_name=$image_name" >> $GITHUB_OUTPUT
-        echo "image_name_cn=$image_name_cn" >> $GITHUB_OUTPUT
-        echo "building image $image_name"
-        is_cn="0" bash script/build_and_push_images.sh "${{ matrix.build_target }}" "$image_name" $is_cn
-        echo "building image $image_name_cn"
-        is_cn="1" bash script/build_and_push_images.sh "${{ matrix.build_target }}" "$image_name_cn" $is_cn
+        ghcr_image_name_cn=$(bash script/get_image_name.sh "ghcr.io" "${{ github.repository_owner }}" "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag_cn }}" | tr '[:upper:]' '[:lower:]')
+        acr_image_name_cn=$(bash script/get_image_name.sh "${{ secrets.ALIYUN_REGISTRY }}" "${{ secrets.ALIYUN_NAMESPACE }}" "${{ matrix.build_target }}" "${{ needs.define-matrix.outputs.tag_cn }}" | tr '[:upper:]' '[:lower:]')
+        echo "ghcr_image_name_cn=$ghcr_image_name_cn" >> $GITHUB_OUTPUT
+        echo "acr_image_name_cn=$acr_image_name_cn" >> $GITHUB_OUTPUT
+        echo "Building and pushing both images..."
+        is_cn="1" bash script/build_and_push_images.sh "${{ matrix.build_target }}" "$ghcr_image_name_cn" "$acr_image_name_cn" $is_cn
     # TODO: generate runtime yaml and json

Framework/nginx/1.22.1/Dockerfile

@@ -1,4 +1,5 @@
 FROM ghcr.io/labring-actions/devbox/node.js-20:219d11
+# Test comment for GitHub Actions trigger
 USER root
 RUN cd /home/devbox/project
 

script/build_and_push_images.sh

@@ -1,14 +1,16 @@
 #!/bin/bash
 
 build_target=$1
-image_name=$2
-is_cn=$3
+image_name1=$2
+image_name2=$3
+is_cn=$4
 
 function build_and_push_image() {
   docker buildx build --push \
     --file "$build_target" \
     --platform linux/amd64 \
-    --tag "$image_name" \
+    --tag "$image_name1" \
+    --tag "$image_name2" \
     .
 }
 
@@ -21,4 +23,4 @@ if [ "$is_cn" == "1" ]; then
   execute_cn_patch
 fi
 
-build_and_push_image
+build_and_push_image

script/get_all_dockerfile.sh

@@ -1,15 +1,23 @@
 #!/bin/bash
 
-if [ "$#" -ne 3 ]; then
-  echo "Usage: $0 <username> <build_target> <tag>"
+if [ "$#" -ne 4 ]; then
+  echo "Usage: $0 <registry> <namespace> <build_target> <tag>"
   exit 1
 fi
 
-USERNAME=$1
-BUILD_TARGET=$2
-TAG=$3
+REGISTRY=$1
+NAMESPACE=$2
+BUILD_TARGET=$3
+TAG=$4
 
+# 提取镜像标识
 IFS='/' read -ra ADDR <<< "$BUILD_TARGET"
 IMAGE_NAME="${ADDR[1]}-${ADDR[2]}"
 
-echo "ghcr.io/$USERNAME/devbox/$IMAGE_NAME:$TAG"
+if [[ "$REGISTRY" == ghcr.io* ]]; then
+  # ghcr.io 格式
+  echo "$REGISTRY/$NAMESPACE/devbox/$IMAGE_NAME:$TAG"
+else
+  # ACR 格式
+  echo "$REGISTRY/$NAMESPACE/$IMAGE_NAME:$TAG"
+fi