From d105cbf5e7a905ef959f70b67acb2c6f5fcd75ad Mon Sep 17 00:00:00 2001 From: aevolution-gitops-bot Date: Thu, 1 Oct 2026 09:28:35 -0400 Subject: [PATCH] fix(promote): inspect pulled image digest --- .gitea/workflows/promote-dev.yaml | 22 +++++++++++++++------- .gitea/workflows/promote-stage.yaml | 22 +++++++++++++++------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/promote-dev.yaml b/.gitea/workflows/promote-dev.yaml index 80dfcca..d5d4e2c 100644 --- a/.gitea/workflows/promote-dev.yaml +++ b/.gitea/workflows/promote-dev.yaml @@ -40,7 +40,7 @@ jobs: run: | set -eu python3 - <<'PY' >> "$GITHUB_OUTPUT" - import base64, json, os, re, urllib.parse, urllib.request + import base64, json, os, re, subprocess, urllib.parse, urllib.request registry = os.environ['HARBOR_REGISTRY'] repository = f"{os.environ['HARBOR_PROJECT']}/{os.environ['HARBOR_REPOSITORY']}" @@ -66,13 +66,21 @@ jobs: run, job = max(candidates, key=lambda item: (item[0].get('run_number', 0), item[0].get('run_attempt', 0))) commit = run['head_sha'] tag = f"sha-{commit}-run-{run['run_number']}-{run.get('run_attempt', 1)}" - logs_url = f"{api_root}/actions/jobs/{job['id']}/logs" - request = urllib.request.Request(logs_url, headers=api_headers) - with urllib.request.urlopen(request, timeout=30) as response: - logs = response.read().decode(errors='replace') - digest_match = re.search(r'Digest:\s+registry\.aeternalisgames\.com/[^@\s]+@(sha256:[0-9a-f]{64})', logs) + image = f"{registry}/{repository}:{tag}" + login = subprocess.run( + ['docker', 'login', registry, '--username', os.environ['HARBOR_USERNAME'], '--password-stdin'], + input=os.environ['HARBOR_PASSWORD'].encode(), stdout=subprocess.DEVNULL, + stderr=subprocess.PIPE, check=False, + ) + if login.returncode: + raise SystemExit(f'docker login failed with status {login.returncode}') + subprocess.run(['docker', 'pull', image], check=True) + repo_digest = subprocess.check_output( + ['docker', 'image', 'inspect', '--format', '{{index .RepoDigests 0}}', image], text=True + ).strip() + digest_match = re.search(r'@(sha256:[0-9a-f]{64})$', repo_digest) if not digest_match: - raise SystemExit(f'No published digest found in successful server-image job {job["id"]}') + raise SystemExit(f'No immutable digest found after pulling {image}') digest = digest_match.group(1) print(f'digest={digest}') print(f'build={digest.removeprefix("sha256:")}') diff --git a/.gitea/workflows/promote-stage.yaml b/.gitea/workflows/promote-stage.yaml index e6db494..cdb2593 100644 --- a/.gitea/workflows/promote-stage.yaml +++ b/.gitea/workflows/promote-stage.yaml @@ -40,7 +40,7 @@ jobs: run: | set -eu python3 - <<'PY' >> "$GITHUB_OUTPUT" - import base64, json, os, re, urllib.parse, urllib.request + import base64, json, os, re, subprocess, urllib.parse, urllib.request registry = os.environ['HARBOR_REGISTRY'] repository = f"{os.environ['HARBOR_PROJECT']}/{os.environ['HARBOR_REPOSITORY']}" @@ -66,13 +66,21 @@ jobs: run, job = max(candidates, key=lambda item: (item[0].get('run_number', 0), item[0].get('run_attempt', 0))) commit = run['head_sha'] tag = f"sha-{commit}-run-{run['run_number']}-{run.get('run_attempt', 1)}" - logs_url = f"{api_root}/actions/jobs/{job['id']}/logs" - request = urllib.request.Request(logs_url, headers=api_headers) - with urllib.request.urlopen(request, timeout=30) as response: - logs = response.read().decode(errors='replace') - digest_match = re.search(r'Digest:\s+registry\.aeternalisgames\.com/[^@\s]+@(sha256:[0-9a-f]{64})', logs) + image = f"{registry}/{repository}:{tag}" + login = subprocess.run( + ['docker', 'login', registry, '--username', os.environ['HARBOR_USERNAME'], '--password-stdin'], + input=os.environ['HARBOR_PASSWORD'].encode(), stdout=subprocess.DEVNULL, + stderr=subprocess.PIPE, check=False, + ) + if login.returncode: + raise SystemExit(f'docker login failed with status {login.returncode}') + subprocess.run(['docker', 'pull', image], check=True) + repo_digest = subprocess.check_output( + ['docker', 'image', 'inspect', '--format', '{{index .RepoDigests 0}}', image], text=True + ).strip() + digest_match = re.search(r'@(sha256:[0-9a-f]{64})$', repo_digest) if not digest_match: - raise SystemExit(f'No published digest found in successful server-image job {job["id"]}') + raise SystemExit(f'No immutable digest found after pulling {image}') digest = digest_match.group(1) print(f'digest={digest}') print(f'build={digest.removeprefix("sha256:")}')