Update check image

.github/workflows/target-image-sync.yml

@@ -22,22 +22,17 @@ jobs:
         MESSAGE: "${{ github.event.issue.body }}"
       run: |
         ORIGIN_IMAGE=$(echo "${MESSAGE}" | grep SYNC | awk '{print $2}' | head -n 1 | sed "s/\r//g")
-        if [[ -z "${ORIGIN_IMAGE}" ]]; then
+        CORRECT_IMAGE="$(./hack/correct-image.sh "${ORIGIN_IMAGE}")"
-          gh issue comment ${{ github.event.issue.number }} -b "找不到镜像呢"
+        if [[ "${CORRECT_IMAGE}" == "" ]]; then
-          gh issue edit ${{ github.event.issue.number }} --title "FAILED SYNC IMAGE"
+          gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不是一个镜像"
-          gh issue close ${{ github.event.issue.number }} --reason "not planned"
           exit 1
         fi
-        if [[ "${ORIGIN_IMAGE}" != *":"* ]]; then
+        if [[ "${CORRECT_IMAGE}" != "${ORIGIN_IMAGE}" ]]; then
-          gh issue comment ${{ github.event.issue.number }} -b "镜像 ${ORIGIN_IMAGE} 不存在呢, 请指定 tag, 如: ${ORIGIN_IMAGE}:latest"
+          if ! ./hack/verify-allows.sh ./allows.txt "${CORRECT_IMAGE}"; then
-          gh issue edit ${{ github.event.issue.number }} --title "FAILED SYNC IMAGE"
+            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 也许应该是 '${CORRECT_IMAGE}', 并且不在白名单列表里, 不支持同步和访问<br>可以将其添加到[白名单](https://github.com/${{ github.repository }}/issues/2328)"
-          gh issue close ${{ github.event.issue.number }} --reason "not planned"
+          else
-          exit 1
+            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 也许应该是 '${CORRECT_IMAGE}'"
-        fi
+          fi
-        if [[ "${ORIGIN_IMAGE%%/*}" != *"."* ]] || [[ "${ORIGIN_IMAGE}" != *"/"* ]]; then
-          gh issue comment ${{ github.event.issue.number }} -b "镜像 ${ORIGIN_IMAGE} 不存在呢, 请指定域名, 如: docker.io/${ORIGIN_IMAGE}"
-          gh issue edit ${{ github.event.issue.number }} --title "FAILED SYNC IMAGE"
-          gh issue close ${{ github.event.issue.number }} --reason "not planned"
           exit 1
         fi
         if ! ./hack/verify-allows.sh ./allows.txt "${ORIGIN_IMAGE}"; then

.github/workflows/target-sync-image.yml

@@ -23,22 +23,19 @@ jobs:
         IMAGE: "${{ github.event.issue.title }}"
       run: |
         ORIGIN_IMAGE="${IMAGE}"
-        if [[ "${ORIGIN_IMAGE}" == *"//"* ]] || [[ "${ORIGIN_IMAGE}" == *" "* ]]; then
+        CORRECT_IMAGE="$(./hack/correct-image.sh "${ORIGIN_IMAGE}")"
+        if [[ "${CORRECT_IMAGE}" == "" ]]; then
           gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不是一个镜像"
           exit 1
         fi
-        if [[ "${ORIGIN_IMAGE%%/*}" != *"."* ]] || [[ "${ORIGIN_IMAGE}" != *"/"* ]]; then
+        if [[ "${CORRECT_IMAGE}" != "${ORIGIN_IMAGE}" ]]; then
-          if [[ "${ORIGIN_IMAGE}" != *":"* ]]; then
+          if ! ./hack/verify-allows.sh ./allows.txt "${CORRECT_IMAGE}"; then
-            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 请指定 域名 和 tag, 如: docker.io/${ORIGIN_IMAGE}:latest"
+            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 也许应该是 '${CORRECT_IMAGE}', 并且不在白名单列表里, 不支持同步和访问<br>可以将其添加到[白名单](https://github.com/${{ github.repository }}/issues/2328)"
           else
-            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 请指定域名, 如: docker.io/${ORIGIN_IMAGE}"
+            gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 也许应该是 '${CORRECT_IMAGE}'"
           fi
           exit 1
         fi
-        if [[ "${ORIGIN_IMAGE}" != *":"* ]]; then
-          gh issue comment ${{ github.event.issue.number }} -b "镜像 '${ORIGIN_IMAGE}' 不存在呢, 请指定 tag, 如: ${ORIGIN_IMAGE}:latest"
-          exit 1
-        fi
         if ! ./hack/verify-allows.sh ./allows.txt "${ORIGIN_IMAGE}"; then
           gh issue comment ${{ github.event.issue.number }} -b "镜像 ${ORIGIN_IMAGE} 不在白名单列表里, 不支持同步和访问<br>可以将其添加到[白名单](https://github.com/${{ github.repository }}/issues/2328)"
           exit 1

hack/correct-image.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+function guess_image() {
+    local image="${1}"
+
+    image="${image# }"
+    image="${image% }"
+
+    if [[ -z "${image}" ]]; then
+        return
+    fi
+
+    if [[ "${image}" == *"registry.docker.com/r"* ]]; then
+        image="docker.io/${image##*registry.hub.docker.com\/r\/}"
+    fi
+    if [[ "${image}" == *"hub.docker.com/r"* ]]; then
+        image="docker.io/${image##*hub.docker.com\/r\/}"
+    fi
+    if [[ "${image%%/*}" != *"."* ]] || [[ "${image}" != *"/"* ]]; then
+        image="docker.io/${image}"
+    fi
+    if [[ "${image}" != *":"* ]]; then
+        image="${image}:latest"
+    fi
+    if [[ "${image}" == *"//"* ]] || [[ "${image}" == *" "* ]]; then
+        return
+    fi
+
+    echo "${image}"
+}
+
+guess_image "${1}"