Add verify docker prefix (#90)

* Add verify docker prefix

* Update args

* Fix the order
This commit is contained in:
Shiming Zhang 2022-03-07 16:56:08 +08:00 committed by GitHub
parent faa1091c40
commit 8ad93d5517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 4 deletions

View File

@ -15,6 +15,9 @@ jobs:
- name: Verify mirror.txt
run: |
./hack/verify-fmt.sh mirror.txt || { echo "Please run './hack/fmt.sh mirror.txt'"; exit 1; }
- name: Verify docker prefix
run: |
./hack/verify-docker-prefix.sh mirror.txt
- name: Verify Image Exists
run: |
./hack/verify-image.sh https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}.patch
./hack/verify-image.sh mirror.txt https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}.patch

26
hack/verify-docker-prefix.sh Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env bash
file=$1
cp ${file} ${file}.bak
cat ${file} | grep docker.io | grep library | sed 's#docker.io/library/#docker.io/#' >>${file}.bak
cat ${file} | grep -e "docker\.io/\w\+:\|docker\.io/\w\+$" | sed 's#docker.io/#docker.io/library/#' >>${file}.bak
$(dirname "${BASH_SOURCE}")/fmt.sh ${file}.bak
result=$(diff ${file} ${file}.bak)
if [[ "${result}" != "" ]]; then
echo "Usually docker.io/* and docker.io/library/* appear in pairs "
echo "Please run following command to fix the issue:"
echo "cat <<EOF >> ${file}"
echo "${result}" | grep "^>" | sed 's/^>\s\+//'
echo "EOF"
echo "./hack/fmt.sh ${file}"
exit 1
fi
rm ${file}.bak

View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash
cp $1 $1.bak
./hack/fmt.sh $1.bak
$(dirname "${BASH_SOURCE}")/fmt.sh $1.bak
diff -c $1 $1.bak && rm $1.bak

View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash
patch_url=$1
file=$1
file=mirror.txt
patch_url=$2
cp "${file}" "${file}.bak"

View File

@ -92,6 +92,7 @@ docker.io/library/alpine
docker.io/library/busybox
docker.io/library/centos
docker.io/library/debian
docker.io/library/docker
docker.io/library/golang
docker.io/library/haproxy
docker.io/library/mariadb
@ -99,6 +100,7 @@ docker.io/library/mysql
docker.io/library/nats-streaming
docker.io/library/nginx
docker.io/library/node
docker.io/library/openjdk
docker.io/library/python
docker.io/library/redis
docker.io/library/registry