Fix support for GitHub Envs, allow multiple tags

Author: cpressland

.github/workflows/retag.yaml

@@ -15,6 +15,10 @@ on:
         description: "The new tag to apply to the image, example: v1.0.0"
         required: true
         type: string
+      environment:
+        description: "The GitHub Environment to use"
+        required: true
+        type: string
     secrets:
       password:
         description: "The password to use for the container registry"
@@ -23,6 +27,7 @@ on:
 jobs:
   retag:
     runs-on: ubuntu-latest
+    environment: ${{ github.event.inputs.environment }}
     steps:
       - uses: actions/setup-python@v5
         with:

README.md

@@ -11,10 +11,10 @@ tagbot \
     --username example \
     --password password \
     --source example.azurecr.io/debian:latest \
-    --tag v1.0.0
+    --tags v1.0.0,1.0.0
 ```
 
-This would add an additional tag of `v1.0.0` to `example.azurecr.io/debian:latest`. The container image can then be pulled with either `example.azurecr.io/debian:latest`, or `example.azurecr.io/debian:v1.0.0`
+This would add an additional tag of `v1.0.0` to `example.azurecr.io/debian:latest`. The container image can then be pulled with either `example.azurecr.io/debian:latest`, `example.azurecr.io/debian:v1.0.0`, or `example.azurecr.io/debian:1.0.0`
 
 ### GitHub Actions Usage
 
@@ -27,19 +27,17 @@ on:
 
 jobs:
   release:
-    name: release
+    uses: binkhq/tagbot/.github/workflows/retag.yaml@master
+    with:
+      username: example
+      source: example.azurecr.io/${{ github.event.repository.name }}:${{ github.ref_name }}
+      tags: ${{ matrix.environment }}-v1.0.0,${{ matrix.environment }}
+      envirnment:  ${{ matrix.environment }}
+    secrets:
+      password: ${{ secrets.ACR_BINKCORE_PASSWORD }}
     strategy:
       matrix:
         environment: [staging, production]
-    environment:
-      name: ${{ matrix.environment }}
-    uses: binkhq/tagbot/.github/workflows/retag.yaml@master
-      with:
-        username: example
-        source: example.azurecr.io/${{ github.event.repository.name }}:${{ github.ref_name }}
-        tag: v1.0.0
-      secrets:
-        password: ${{ secrets.ACR_PASSWORD }}
 ```
 
 ## FAQ

container_tagbot/__init__.py

@@ -7,24 +7,22 @@
 from loguru import logger as log
 
 
-def tagbot(username: str, password: str, source: str, new_tag: str) -> None:
+def tagbot(username: str, password: str, source: str, new_tags: str) -> None:
     """Tag a container image in a registry.
 
     Args:
     ----
         username (str): Username for Container Registry
         password (str): Password for Container Registry
         source (str): Source Container Image and Tag
-        new_tag (str): New Container Image Tag
+        new_tags (str): New Container Image Tags, comma seperated
 
     Returns:
     -------
         None
     """
     registry, image, tag = re.split("[:/]", source)
 
-    log.info(f"Tagging {registry}/{image}:{tag} to {registry}/{image}:{new_tag}")
-
     try:
         source_image = requests.get(
             f"https://{registry}/v2/{image}/manifests/{tag}",
@@ -41,24 +39,26 @@ def tagbot(username: str, password: str, source: str, new_tag: str) -> None:
     except requests.exceptions.HTTPError:
         log.exception(source_image.text)
 
-    try:
-        dest_image = requests.put(
-            f"https://{registry}/v2/{image}/manifests/{new_tag}",
-            headers={"Content-Type": source_image.headers["Content-Type"]},
-            auth=(username, password),
-            data=source_image.text,
-            timeout=30,
-        )
-        dest_image.raise_for_status()
-    except requests.exceptions.HTTPError:
-        log.exception(dest_image.text)
+    for new_tag in new_tags.split(","):
+        log.info(f"Tagging {registry}/{image}:{tag} to {registry}/{image}:{new_tag}")
+        try:
+            dest_image = requests.put(
+                f"https://{registry}/v2/{image}/manifests/{new_tag}",
+                headers={"Content-Type": source_image.headers["Content-Type"]},
+                auth=(username, password),
+                data=source_image.text,
+                timeout=30,
+            )
+            dest_image.raise_for_status()
+        except requests.exceptions.HTTPError:
+            log.exception(dest_image.text)
 
 
 @click.command()
 @click.option("--username", "-u", required=True, help="Username for Container Registry")
 @click.option("--password", "-p", required=True, help="Password for Container Registry")
 @click.option("--source", "-s", required=True, help="Source Container Image")
-@click.option("--tag", "-t", required=True, help="New Container Image Tag")
-def cli(username: str, password: str, source: str, tag: str) -> None:
+@click.option("--tags", "-t", required=True, help="New Container Image Tags, comma seperated")
+def cli(username: str, password: str, source: str, tags: str) -> None:
     """Tagbot: Tag a container image in a registry."""
-    tagbot(username=username, password=password, source=source, new_tag=tag)
+    tagbot(username=username, password=password, source=source, new_tags=tags)