Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/scripts/infra_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,9 @@ def _publish_computers(folder: Path) -> int:
if served is None and ": not found" not in error:
print(f"::warning::{index} is taken as unpublished, since the registry won't say: {error}")
if served is None:
source = f"https://github.com/{os.environ['GITHUB_REPOSITORY']}"
# No --annotation: a compose pushes Docker media types, and buildx refuses annotations on a Docker list.
created = _tried_again(lambda: _streamed([
"docker", "buildx", "imagetools", "create", "-t", index,
"--annotation", f"index:org.opencontainers.image.source={source}",
"--annotation", f"index:org.opencontainers.image.revision={os.environ['GITHUB_SHA']}",
*(f"localhost:5000/agentenv-computers@{digests[arch]}" for arch in COMPUTER_ARCHES)]))
if created.returncode:
return created.returncode
Expand Down
2 changes: 0 additions & 2 deletions tst/unit/test_infra_build_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,6 @@ def test_publish_computers_joins_each_apps_platform_manifests_into_one_index_and
assert _run(script, monkeypatch, "publish-computers", str(folder)) == 0

assert created == [["docker", "buildx", "imagetools", "create", "-t", _COMPUTER_INDEX,
"--annotation", "index:org.opencontainers.image.source=https://github.com/scaleapi/agentenv-framework",
"--annotation", "index:org.opencontainers.image.revision=c0ffee",
f"{_LOCAL}@{_AMD64}", f"{_LOCAL}@{_ARM64}"]]
computers = json.loads((folder / "computers.json").read_text())
assert computers == [{"env": CHROMIUM, "form": "container", "index": f"{_COMPUTER_INDEX}@{_INDEX}", "arches": {
Expand Down
Loading