7x31/public-image-mirror
1
0
Fork 0
mirror of https://github.com/DaoCloud/public-image-mirror.git synced 2025-08-11 18:46:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Skip clearly there is a difference

Browse Source
This commit is contained in:
Shiming Zhang
2021-09-13 20:24:37 +08:00
parent 023b45c9f8
commit 557a3bcf84
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/diff-image.sh
View File

@@ -134,8 +134,8 @@ function diff-image() {
local tags1="$(list-tags ${image1})" local tags1="$(list-tags ${image1})"
local tags2="$(list-tags ${image2})" local tags2="$(list-tags ${image2})"
local diff_raw="$(diff --unified <(echo "${tags1}") <(echo "${tags2}"))" local diff_raw="$(diff --unified <(echo "${tags1}") <(echo "${tags2}") | grep -v -E '^---' | grep -v -E '^\+\+\+')"
local diff_data="$(echo "${diff_raw}" | grep -v -E '^ ' | grep -v -E '^---' | grep -v -E '^\+\+\+')" local diff_data="$(echo "${diff_raw}" | grep -v -E '^ ')"
if [[ "${INCREMENTAL}" == "true" ]]; then if [[ "${INCREMENTAL}" == "true" ]]; then
diff_data="$(echo "${diff_data}" | grep -v -E '^\+')" diff_data="$(echo "${diff_data}" | grep -v -E '^\+')"
@@ -151,7 +151,15 @@ function diff-image() {
echo "DEBUG: diff:" >&2 echo "DEBUG: diff:" >&2
echo "${diff_data}" >&2 echo "${diff_data}" >&2
fi fi
echo "${tags1}" for tag in $(echo "$(echo "${diff_raw}" | grep -E '^-')"); do
tag="${tag#-}"
echo "${SELF}: UNSYNC: ${image1}:${tag} and ${image2}:${tag} are not in synchronized, ${image2}:${tag} is empty" >&2
done
for tag in $(echo "$(echo "${diff_raw}" | grep -E '^\+')"); do
tag="${tag#+}"
echo "${SELF}: UNSYNC: ${image1}:${tag} and ${image2}:${tag} are not in synchronized, ${image1}:${tag} is empty" >&2
done
echo "$(echo "${diff_raw}" | grep -E '^ ' | tr -d ' ')"
return 1 return 1
fi fi
echo "${SELF}: SYNC-TAGS: ${image1} and ${image2} are in synchronized" >&2 echo "${SELF}: SYNC-TAGS: ${image1} and ${image2} are in synchronized" >&2