Remove annotations

Author: athackst

.github/actions/docker-bake/action.yml

@@ -76,9 +76,9 @@ runs:
         python-version: "3.x"
         cache: "pip"
 
-    - name: Install python deps
+    - name: Install dependencies
       shell: bash
-      run: pip install -r requirements.txt
+      run: pip install -r "${{ github.action_path }}/requirements.txt"
 
     - name: Detect build platform
       id: detect

.github/actions/docker-bake/requirements.txt

@@ -0,0 +1,3 @@
+actions_toolkit
+ruamel.yaml
+typing_extensions

.github/actions/docker-merge/action.yml

@@ -69,18 +69,14 @@ runs:
       shell: bash
       run: |
         set -euo pipefail
-        cmd=(python .github/actions/docker-merge/merge_manifests.py
-             --family "${{ inputs.family }}"
-             --distro "${{ inputs.distro }}"
-             --metadata-list "${{ inputs.metadata }}"
-             ${{ inputs.ghcr-password && format('--gh-owner "{0}"', inputs.ghcr-username) || '' }}
-             ${{ inputs.docker-password && format('--dockerhub-username "{0}"', inputs.docker-username) || '' }}
-             ${{ inputs.extra-tag != '' && format('--extra-tag "{0}"', inputs.extra-tag) || '' }}
-        )
-        if [[ "${{ inputs.dry-run }}" == "true" ]]; then
-          cmd+=(--dry-run)
-        fi
-        "${cmd[@]}"
+        python .github/actions/docker-merge/merge_manifests.py \
+            --family "${{ inputs.family }}" \
+            --distro "${{ inputs.distro }}" \
+            --metadata-list "${{ inputs.metadata }}" \
+            ${{ inputs.ghcr-password && format('--gh-owner "{0}"', inputs.ghcr-username) || '' }} \
+            ${{ inputs.docker-password && format('--dockerhub-username "{0}"', inputs.docker-username) || '' }} \
+            ${{ inputs.extra-tag != '' && format('--extra-tag "{0}"', inputs.extra-tag) || '' }} \
+            ${{ inputs.dry-run == "true" && format('--dry-run') || ''}}
 
     - name: Summary
       if: always()

.github/actions/docker-merge/merge_manifests.py

@@ -11,14 +11,6 @@
 from typing import Dict, Iterable, List, Set
 
 MetadataEntries = Dict[str, List[Dict[str, str]]]
-STAGE_DESCRIPTIONS = {
-    "base": "Base image",
-    "dev": "Developer image",
-    "full": "Desktop image",
-    "gazebo": "Gazebo image",
-    "gazebo-nvidia": "Gazebo NVIDIA/CUDA image",
-    "nvidia": "NVIDIA/CUDA image",
-}
 
 
 def parse_args() -> argparse.Namespace:
@@ -214,13 +206,6 @@ def compute_tags(
     return tags
 
 
-def manifest_description(family: str, distro: str, stage: str) -> str:
-    """Return an OCI description for the multi-arch manifest."""
-    base = STAGE_DESCRIPTIONS.get(stage, stage.replace("-", " ").title())
-    pretty_distro = distro.replace("-", " ").title()
-    return f"{family.upper()} {pretty_distro} {base}".strip()
-
-
 def write_output(name: str, value: str) -> None:
     """Emit a GitHub Actions output key/value pair."""
     output_path = os.environ.get("GITHUB_OUTPUT")
@@ -258,16 +243,9 @@ def main() -> int:
         )
         if not tags:
             raise ValueError("No destination tags specified for merge action.")
-        annotation = manifest_description(args.family, args.distro, stage_name)
         cmd = ["docker", "buildx", "imagetools", "create"]
         for tag in tags:
             cmd.extend(["--tag", tag])
-        cmd.extend(
-            [
-                "--annotation",
-                f"org.opencontainers.image.description={annotation}",
-            ]
-        )
         cmd.extend(refs)
         print(f"[merge] {target}: creating manifest with {len(refs)} refs")
         print("        tags:", ", ".join(tags))