diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e68af8e..057bbf1 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -31,11 +31,19 @@ jobs: [[ -z "$line" ]] && continue echo "docker pull $line" docker pull $line + platform=$(echo "$line" | grep -oP '(?<=--platform[ =])[^ ]+') + # 如果存在platform拼到镜像名称前面 + if [ -z "$platform" ]; then + platform_prefix="" + else + platform_prefix="${platform//\//-}_" + fi + echo "platform is $platform" # 获取镜像的完整名称,例如kasmweb/nginx:1.25.3(命名空间/镜像名:版本号) image=$(echo "$line" | awk '{print $NF}') # 获取 镜像名:版本号 例如nginx:1.25.3 image_name_tag=$(echo "$image" | awk -F'/' '{print $NF}') - new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$image_name_tag" + new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$platform_prefix$image_name_tag" echo "docker tag $image $new_image" docker tag $image $new_image echo "docker push $new_image" diff --git a/images.txt b/images.txt index 9d47a4f..66e6eb2 100644 --- a/images.txt +++ b/images.txt @@ -1,5 +1,5 @@ alpine python:alpine3.19 kasmweb/nginx:1.25.3 ---platform linux/arm64 cooderl/wewe-rss-sqlite:latest - +--platform linux/amd64 redis:7.0.15-alpine3.20 +--platform linux/arm/v7 redis:7.0.15-alpine3.20