add more options to dev build

Author: gilesknap

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml

src/epics_containers_cli/dev/dev_cli.py

@@ -213,6 +213,10 @@ def build(
     cache_from: Optional[str] = typer.Option(None, help="buildx cache from folder"),
     push: bool = typer.Option(False, help="buildx push to registry"),
     rebuild: bool = typer.Option(True, help="rebuild the image even if it exists"),
+    target: Optional[str] = typer.Option(
+        None, help="target to build (default: developer and runtime)"
+    ),
+    suffix: Optional[str] = typer.Option(None, help="suffix for image"),
 ):
     """
     Build a generic IOC container locally from a container project.
@@ -229,4 +233,6 @@ def build(
         cache_to=cache_to,
         push=push,
         rebuild=rebuild,
+        target=target,
+        suffix=suffix,
     )

src/epics_containers_cli/dev/dev_commands.py

@@ -190,6 +190,8 @@ def build(
         cache_to: Optional[str],
         push: bool,
         rebuild: bool,
+        target: Optional[str],
+        suffix: Optional[str],
     ):
         """
         build a local image from a Dockerfile
@@ -198,7 +200,7 @@ def build(
         args = f"--platform {platform} {'--no-cache' if not cache else ''}"
 
         for target in Targets:
-            image = get_image_name(repo, arch, target)
+            image = get_image_name(repo, arch, target, suffix)
             image_name = f"{image}:{tag}"
 
             if not rebuild:

src/epics_containers_cli/git.py

@@ -5,7 +5,7 @@
 import os
 import re
 from pathlib import Path
-from typing import Tuple
+from typing import Optional, Tuple
 
 import typer
 
@@ -19,11 +19,17 @@
 
 
 def get_image_name(
-    repo: str, arch: Architecture = Architecture.linux, target: str = "developer"
+    repo: str,
+    arch: Architecture = Architecture.linux,
+    target: str = "developer",
+    suffix: Optional[str] = None,
 ) -> str:
+    if suffix is None:
+        suffix = "-{arch}-{target}"
     registry = repo2registry(repo).lower().removesuffix(".git")
+    img_suffix = suffix.format(repo=repo, arch=arch, target=target, registry=registry)
 
-    image = f"{registry}-{arch}-{target}"
+    image = f"{registry}{img_suffix}"
     log.info("repo = %s image  = %s", repo, image)
     return image
 

tests/conftest.py

@@ -38,8 +38,8 @@ class MockRun:
     cmd = "cmd"
     rsp = "rsp"
 
-    def __init__(self):
-        self.cmd_rsp = {}
+    def __init__(self) -> None:
+        self.cmd_rsp: List[Dict] = []
         self._runner = CliRunner()
         self.log: str = ""
         self.params: List[str] = []