Skip to content

Commit d078119

Browse files
suyarsuyar
committed
Revert "chore: only sync amd64"
This reverts commit ff4fa8c.
1 parent ff4fa8c commit d078119

11 files changed

Lines changed: 110 additions & 55 deletions

‎.github/workflows/sync-drone-runner.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,24 @@ jobs:
4545
run: |
4646
set -o pipefail
4747
48-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
48+
SRC_RAW="$(mktemp)"
49+
DST_RAW="$(mktemp)"
50+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4951
50-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
51-
if [ -z "$SRC_DIGEST" ]; then
52+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5253
echo "Failed to resolve source digest: $SRC"
5354
exit 1
5455
fi
56+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5557
56-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
58+
DST_DIGEST=""
59+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
60+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
61+
fi
5762
5863
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5964
echo "Digest unchanged ($SRC_DIGEST), skip sync."
6065
exit 0
6166
fi
6267
63-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
68+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-drone-server.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,24 @@ jobs:
4545
run: |
4646
set -o pipefail
4747
48-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
48+
SRC_RAW="$(mktemp)"
49+
DST_RAW="$(mktemp)"
50+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4951
50-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
51-
if [ -z "$SRC_DIGEST" ]; then
52+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5253
echo "Failed to resolve source digest: $SRC"
5354
exit 1
5455
fi
56+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5557
56-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
58+
DST_DIGEST=""
59+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
60+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
61+
fi
5762
5863
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5964
echo "Digest unchanged ($SRC_DIGEST), skip sync."
6065
exit 0
6166
fi
6267
63-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
68+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-gitea-gitea.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,24 @@ jobs:
4545
run: |
4646
set -o pipefail
4747
48-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
48+
SRC_RAW="$(mktemp)"
49+
DST_RAW="$(mktemp)"
50+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4951
50-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
51-
if [ -z "$SRC_DIGEST" ]; then
52+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5253
echo "Failed to resolve source digest: $SRC"
5354
exit 1
5455
fi
56+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5557
56-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
58+
DST_DIGEST=""
59+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
60+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
61+
fi
5762
5863
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5964
echo "Digest unchanged ($SRC_DIGEST), skip sync."
6065
exit 0
6166
fi
6267
63-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
68+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-gitea-runner.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,24 @@ jobs:
4444
run: |
4545
set -o pipefail
4646
47-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
47+
SRC_RAW="$(mktemp)"
48+
DST_RAW="$(mktemp)"
49+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4850
49-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
50-
if [ -z "$SRC_DIGEST" ]; then
51+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5152
echo "Failed to resolve source digest: $SRC"
5253
exit 1
5354
fi
55+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5456
55-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
57+
DST_DIGEST=""
58+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
59+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
60+
fi
5661
5762
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5863
echo "Digest unchanged ($SRC_DIGEST), skip sync."
5964
exit 0
6065
fi
6166
62-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
67+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-mysql.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,24 @@ jobs:
4949
run: |
5050
set -o pipefail
5151
52-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
52+
SRC_RAW="$(mktemp)"
53+
DST_RAW="$(mktemp)"
54+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
5355
54-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
55-
if [ -z "$SRC_DIGEST" ]; then
56+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5657
echo "Failed to resolve source digest: $SRC"
5758
exit 1
5859
fi
60+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5961
60-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
62+
DST_DIGEST=""
63+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
64+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
65+
fi
6166
6267
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
6368
echo "Digest unchanged ($SRC_DIGEST), skip sync."
6469
exit 0
6570
fi
6671
67-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
72+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-nginx.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,24 @@ jobs:
4545
run: |
4646
set -o pipefail
4747
48-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
48+
SRC_RAW="$(mktemp)"
49+
DST_RAW="$(mktemp)"
50+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4951
50-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
51-
if [ -z "$SRC_DIGEST" ]; then
52+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5253
echo "Failed to resolve source digest: $SRC"
5354
exit 1
5455
fi
56+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5557
56-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
58+
DST_DIGEST=""
59+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
60+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
61+
fi
5762
5863
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5964
echo "Digest unchanged ($SRC_DIGEST), skip sync."
6065
exit 0
6166
fi
6267
63-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
68+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-redis.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,24 @@ jobs:
6060
run: |
6161
set -o pipefail
6262
63-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
63+
SRC_RAW="$(mktemp)"
64+
DST_RAW="$(mktemp)"
65+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
6466
65-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
66-
if [ -z "$SRC_DIGEST" ]; then
67+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
6768
echo "Failed to resolve source digest: $SRC"
6869
exit 1
6970
fi
71+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
7072
71-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
73+
DST_DIGEST=""
74+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
75+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
76+
fi
7277
7378
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
7479
echo "Digest unchanged ($SRC_DIGEST), skip sync."
7580
exit 0
7681
fi
7782
78-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
83+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-vaultwarden-backup.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,24 @@ jobs:
4444
run: |
4545
set -o pipefail
4646
47-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
47+
SRC_RAW="$(mktemp)"
48+
DST_RAW="$(mktemp)"
49+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4850
49-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
50-
if [ -z "$SRC_DIGEST" ]; then
51+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5152
echo "Failed to resolve source digest: $SRC"
5253
exit 1
5354
fi
55+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5456
55-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
57+
DST_DIGEST=""
58+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
59+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
60+
fi
5661
5762
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5863
echo "Digest unchanged ($SRC_DIGEST), skip sync."
5964
exit 0
6065
fi
6166
62-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
67+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-vaultwarden-server.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,24 @@ jobs:
4444
run: |
4545
set -o pipefail
4646
47-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
47+
SRC_RAW="$(mktemp)"
48+
DST_RAW="$(mktemp)"
49+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4850
49-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
50-
if [ -z "$SRC_DIGEST" ]; then
51+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5152
echo "Failed to resolve source digest: $SRC"
5253
exit 1
5354
fi
55+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5456
55-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
57+
DST_DIGEST=""
58+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
59+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
60+
fi
5661
5762
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5863
echo "Digest unchanged ($SRC_DIGEST), skip sync."
5964
exit 0
6065
fi
6166
62-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
67+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

‎.github/workflows/sync-woodpecker-agent.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,24 @@ jobs:
4444
run: |
4545
set -o pipefail
4646
47-
SKOPEO_PLATFORM=(--override-os linux --override-arch amd64)
47+
SRC_RAW="$(mktemp)"
48+
DST_RAW="$(mktemp)"
49+
trap 'rm -f "$SRC_RAW" "$DST_RAW"' EXIT
4850
49-
SRC_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$SRC" 2>/dev/null || true)"
50-
if [ -z "$SRC_DIGEST" ]; then
51+
if ! skopeo inspect --raw "docker://$SRC" > "$SRC_RAW" 2>/dev/null || [ ! -s "$SRC_RAW" ]; then
5152
echo "Failed to resolve source digest: $SRC"
5253
exit 1
5354
fi
55+
SRC_DIGEST="sha256:$(sha256sum "$SRC_RAW" | awk '{print $1}')"
5456
55-
DST_DIGEST="$(skopeo inspect "${SKOPEO_PLATFORM[@]}" --format '{{.Digest}}' "docker://$DST" 2>/dev/null || true)"
57+
DST_DIGEST=""
58+
if skopeo inspect --raw "docker://$DST" > "$DST_RAW" 2>/dev/null && [ -s "$DST_RAW" ]; then
59+
DST_DIGEST="sha256:$(sha256sum "$DST_RAW" | awk '{print $1}')"
60+
fi
5661
5762
if [ -n "$DST_DIGEST" ] && [ "$SRC_DIGEST" = "$DST_DIGEST" ]; then
5863
echo "Digest unchanged ($SRC_DIGEST), skip sync."
5964
exit 0
6065
fi
6166
62-
skopeo copy "${SKOPEO_PLATFORM[@]}" --retry-times 3 "docker://$SRC" "docker://$DST"
67+
skopeo copy --multi-arch all --retry-times 3 "docker://$SRC" "docker://$DST"

0 commit comments

Comments
 (0)