diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index a0fa896..570a93c 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -40,18 +40,7 @@ jobs: gh pr comment "${{ github.event.pull_request.number }}" --body '请运行 `./hack/fmt.sh mirror.txt` 对内容进行排序' exit 1 } - - name: Verify docker Prefix - run: | - ./hack/verify-docker-prefix.sh mirror.txt || { - gh pr comment "${{ github.event.pull_request.number }}" --body '请成对提交 `docker.io/*` 和 `docker.io/library/*` 形式的镜像' - exit 1 - } - - name: Verify k8s Prefix - run: | - ./hack/verify-k8s-prefix.sh mirror.txt || { - gh pr comment "${{ github.event.pull_request.number }}" --body '请使用 `registry.k8s.io/*` 替代 `k8s.gcr.io/*`' - exit 1 - } + - name: Verify Image Exists run: | ./hack/verify-image.sh mirror.txt https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}.patch || { diff --git a/hack/fmt.sh b/hack/fmt.sh index 3d13269..43d2272 100755 --- a/hack/fmt.sh +++ b/hack/fmt.sh @@ -2,4 +2,28 @@ export LC_ALL=C -cat $1 | sort -u | grep -v '^$' > $1.tmp && mv $1.tmp $1 +function filter_docker_library() { + while read -r line; do + if [[ $line =~ ^docker\.io/[^/]*$ ]]; then + echo "docker.io/library/${line#docker.io/}" + else + echo "${line}" + fi + done +} + +function filter_k8s_old() { + while read -r line; do + if [[ $line =~ ^k8s\.gcr\.io/[^/]*$ ]]; then + echo "registry.k8s.io/${line#k8s.gcr.io/}" + else + echo "${line}" + fi + done +} + +cat $1 | + filter_docker_library | + filter_k8s_old | + sort -u | + grep -v '^$' >$1.tmp && mv $1.tmp $1 diff --git a/mirror.txt b/mirror.txt index fd98985..548bb5a 100644 --- a/mirror.txt +++ b/mirror.txt @@ -3,7 +3,6 @@ docker.elastic.co/elasticsearch/elasticsearch docker.elastic.co/kibana/kibana docker.elastic.co/kibana/kibana-oss docker.io/adoptopenjdk/openjdk11 -docker.io/alpine docker.io/alpine/helm docker.io/amambadev/jenkins docker.io/amambadev/jenkins-agent-base @@ -49,9 +48,7 @@ docker.io/bitpoke/mysql-operator docker.io/bitpoke/mysql-operator-orchestrator docker.io/bitpoke/mysql-operator-sidecar-5.7 docker.io/bitpoke/mysql-operator-sidecar-8.0 -docker.io/busybox docker.io/byrnedo/alpine-curl -docker.io/caddy docker.io/calico/apiserver docker.io/calico/cni docker.io/calico/csi @@ -62,7 +59,6 @@ docker.io/calico/pod2daemon-flexvol docker.io/calico/typha docker.io/cdkbot/hostpath-provisioner-amd64 docker.io/cdkbot/registry-amd64 -docker.io/centos docker.io/centos/tools docker.io/cfmanteiga/alpine-bash-curl-jq docker.io/cfssl/cfssl @@ -77,9 +73,7 @@ docker.io/datadog/agent docker.io/datadog/cluster-agent docker.io/datawire/ambassador docker.io/datawire/ambassador-operator -docker.io/debian docker.io/directxman12/k8s-prometheus-adapter -docker.io/docker docker.io/dpage/pgadmin4 docker.io/elastic/filebeat docker.io/envoyproxy/envoy @@ -116,12 +110,10 @@ docker.io/goharbor/notary-signer-photon docker.io/goharbor/redis-photon docker.io/goharbor/registry-photon docker.io/goharbor/trivy-adapter-photon -docker.io/golang docker.io/golangci/golangci-lint docker.io/grafana/grafana docker.io/grafana/tempo docker.io/halverneus/static-file-server -docker.io/haproxy docker.io/honkit/honkit docker.io/integratedcloudnative/ovn4nfv-k8s-plugin docker.io/istio/citadel @@ -149,7 +141,6 @@ docker.io/jaegertracing/jaeger-es-rollover docker.io/jaegertracing/jaeger-operator docker.io/jaegertracing/jaeger-query docker.io/jaegertracing/spark-dependencies -docker.io/java docker.io/jboss/keycloak docker.io/jenkins/inbound-agent docker.io/jertel/elastalert2 @@ -236,7 +227,6 @@ docker.io/longhornio/longhorn-instance-manager docker.io/longhornio/longhorn-manager docker.io/longhornio/longhorn-share-manager docker.io/longhornio/longhorn-ui -docker.io/mariadb docker.io/mellanox/centos_7_4_mofed_4_2_1_2_0_0_60 docker.io/mellanox/k8s-rdma-shared-dev-plugin docker.io/mellanox/mlnx_ofed_linux-4.4-1.0.0.0-centos7.4 @@ -257,22 +247,16 @@ docker.io/mohsinonxrm/mongodb-agent docker.io/mohsinonxrm/mongodb-kubernetes-operator docker.io/mohsinonxrm/mongodb-kubernetes-operator-version-upgrade-post-start-hook docker.io/mohsinonxrm/mongodb-kubernetes-readiness -docker.io/mongo docker.io/multiarch/qemu-user-static -docker.io/mysql docker.io/n8nio/n8n docker.io/nacos/nacos-server -docker.io/nats-streaming docker.io/neuvector/controller docker.io/neuvector/enforcer docker.io/neuvector/manager docker.io/neuvector/scanner docker.io/neuvector/updater -docker.io/nextcloud docker.io/nfvpe/multus -docker.io/nginx docker.io/nginxdemos/hello -docker.io/node docker.io/oamdev/cluster-gateway docker.io/oamdev/kube-webhook-certgen docker.io/oamdev/terraform-controller @@ -290,7 +274,6 @@ docker.io/openebs/openebs-k8s-provisioner docker.io/openebs/provisioner-localpv docker.io/openebs/snapshot-controller docker.io/openebs/snapshot-provisioner -docker.io/openjdk docker.io/openkruise/kruise-manager docker.io/openpolicyagent/gatekeeper docker.io/openstorage/stork @@ -299,21 +282,15 @@ docker.io/osixia/openldap docker.io/otel/demo docker.io/otel/opentelemetry-collector docker.io/otel/opentelemetry-collector-contrib -docker.io/percona docker.io/percona/mongodb_exporter -docker.io/perl -docker.io/phpmyadmin docker.io/phpmyadmin/phpmyadmin docker.io/pingcap/coredns docker.io/portainer/portainer-ce -docker.io/postgres docker.io/prom/alertmanager docker.io/prom/mysqld-exporter docker.io/prom/node-exporter docker.io/prom/prometheus docker.io/prometheuscommunity/postgres-exporter -docker.io/python -docker.io/rabbitmq docker.io/rabbitmqoperator/cluster-operator docker.io/rancher/helm-controller docker.io/rancher/k3d-tools @@ -321,11 +298,8 @@ docker.io/rancher/k3s docker.io/rancher/kubectl docker.io/rancher/local-path-provisioner docker.io/rclone/rclone -docker.io/redis docker.io/redislabs/redisearch -docker.io/registry docker.io/seataio/seata-server -docker.io/sonarqube docker.io/sonobuoy/cluster-inventory docker.io/sonobuoy/kube-bench docker.io/sonobuoy/sonobuoy @@ -336,8 +310,6 @@ docker.io/tensorflow/tensorflow docker.io/tgagor/centos-stream docker.io/thanosio/thanos docker.io/timberio/vector -docker.io/traefik -docker.io/ubuntu docker.io/velero/velero docker.io/victoriametrics/operator docker.io/victoriametrics/victoria-logs @@ -350,10 +322,8 @@ docker.io/victoriametrics/vmstorage docker.io/weaveworks/scope docker.io/weaveworks/weave-kube docker.io/weaveworks/weave-npc -docker.io/wordpress docker.io/xueshanf/install-socat docker.io/zenko/kafka-manager -docker.io/zookeeper gcr.io/cadvisor/cadvisor gcr.io/distroless/base gcr.io/distroless/static