diff --git a/.github/scripts/infra_build.py b/.github/scripts/infra_build.py index 4be691415..78a7dde8d 100644 --- a/.github/scripts/infra_build.py +++ b/.github/scripts/infra_build.py @@ -268,11 +268,9 @@ def _publish(missing: str) -> int: continue if code != 1: return 1 + # No --annotation: buildx refuses annotations on a Docker list; each platform build carries the same --labels. created = _tried_again(lambda: _streamed([ - "docker", "buildx", "imagetools", "create", "-t", ref, - "--annotation", f"index:org.opencontainers.image.source=https://github.com/{os.environ['GITHUB_REPOSITORY']}", - "--annotation", f"index:org.opencontainers.image.revision={os.environ['GITHUB_SHA']}", - f"{ref}-amd64", f"{ref}-arm64"])) + "docker", "buildx", "imagetools", "create", "-t", ref, f"{ref}-amd64", f"{ref}-arm64"])) if created.returncode: return created.returncode return 0 diff --git a/tst/unit/test_infra_build_script.py b/tst/unit/test_infra_build_script.py index cc3a3706d..e546f2943 100644 --- a/tst/unit/test_infra_build_script.py +++ b/tst/unit/test_infra_build_script.py @@ -248,9 +248,7 @@ def test_publish_tags_each_new_images_platform_builds_as_one_and_leaves_a_publis assert _run(script, monkeypatch, "publish", json.dumps([json.loads(_gateway()), json.loads(_disk())])) == 0 assert calls[0] == ["docker", "login", "ghcr.io", "--username", "bot", "--password-stdin"] - assert runs == [["docker", "buildx", "imagetools", "create", "-t", new, - "--annotation", "index:org.opencontainers.image.source=https://github.com/scaleapi/agentenv-framework", - "--annotation", "index:org.opencontainers.image.revision=c0ffee", f"{new}-amd64", f"{new}-arm64"]] + assert runs == [["docker", "buildx", "imagetools", "create", "-t", new, f"{new}-amd64", f"{new}-arm64"]] assert f"{published} is published already, so it's left as it is" in capsys.readouterr().out