From eb3c8c1488df1e6dfa9ae40f5916d04579ed16d0 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 17 Jul 2025 06:44:49 -0700 Subject: [PATCH] test --- .gitea/workflows/base-build.yml | 37 +++++++++------------------------ 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index d2759f2..60b8a08 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -209,39 +209,22 @@ jobs: echo "[INFO] Generating build-info.json for $version" mkdir -p "$version" infofile="$version/build-info.json" - metadata_file="${CACHE_DIR}/metadata-$version.json" image="${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO_TS}:$version" - if [ -f "$metadata_file" ]; then - digest=$(jq -r '.digest' "$metadata_file" 2>/dev/null) - size_bytes=$(jq -r '.size' "$metadata_file" 2>/dev/null) - size_bytes=${size_bytes:-0} - else - echo "[WARN] Metadata file $metadata_file not found, falling back to unknown" - digest="unknown" - size_bytes=0 - fi - size_human=$(human_size "$size_bytes") - echo "ALPINE_DIGEST=$ALPINE_DIGEST" - echo "DEBIAN_DIGEST=$DEBIAN_DIGEST" - echo "BASIC_DIGEST=$BASIC_DIGEST" + alpine_digest=$(docker inspect --format='{{index .RepoDigests 0}}' alpine:latest || echo "unknown") + debian_digest=$(docker inspect --format='{{index .RepoDigests 0}}' gitea.fithwum.tech/${{ secrets.GIT_USERNAME }}/debian-base:bookworm || echo "unknown") + basic_digest=$(docker inspect --format='{{index .RepoDigests 0}}' gitea.fithwum.tech/${{ secrets.GIT_USERNAME }}/debian-base:bookworm || echo "unknown") base_digest="unknown" - case "$version" in - alpine) base_digest="$ALPINE_DIGEST" ;; - debian) base_digest="$DEBIAN_DIGEST" ;; - basic) base_digest="$BASIC_DIGEST" ;; - esac - - # if [ "$version" = "alpine" ]; then - # base_digest="${ALPINE_DIGEST:-unknown}" - # elif [ "$version" = "debian" ]; then - # base_digest="${DEBIAN_DIGEST:-unknown}" - # elif [ "$version" = "basic" ]; then - # base_digest="${BASIC_DIGEST:-unknown}" - # fi + if [ "$version" = "alpine" ]; then + base_digest="${alpine_digest:-unknown}" + elif [ "$version" = "debian" ]; then + base_digest="${debian_digest:-unknown}" + elif [ "$version" = "basic" ]; then + base_digest="${basic_digest:-unknown}" + fi echo "[DEBUG] base_digest for $version = $base_digest"