feat(ci/github/agent): build on both tag and commit

Author: ayuskauskas

.github/workflows/agent-container.yaml

@@ -3,6 +3,8 @@ name: Build and push container image
 # Configures this workflow to run every time a tag is created
 on:
   push:
+    tags-ignore:
+      - operator/*
     paths:
       - agent/**
       - containers/agent.Dockerfile
@@ -20,6 +22,8 @@ env:
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
   build-and-push-agent:
+    # only run for tags on the main branch
+    if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
     permissions:
@@ -51,10 +55,25 @@ jobs:
         run: |
           apt-get update && apt-get install -y make git jq
           cd agent
-          export TAGS="-t ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${{ github.sha }}"
+          # if this is a tag build, use the tag as the version, otherwise use the sha
+          TAGS="-t ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${{ github.sha }}
+          case ${{ github.ref_type }} in
+            branch)
+                # The last tag + current git sha
+                export AGENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0")+${{ github.sha }}
+                ;;
+            tag)
+                # The version part of the tag
+                export AGENT_VERSION=$(echo "${{ github.ref_name }}" | cut -f 2 -d /)
+                TAGS="$TAGS -t ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${AGENT_VERSION}"
+                ;;
+            *)
+                echo "Unkown type ${{ github.ref_type }}"
+                exit 1
+                ;;
+          esac
+          export TAGS=$TAGS
           export REGISTRY=${REGISTRY@L}
-          # Get the last tag and use it as the env var AGENT_VERSION if it doesn't exist use 0.0.0+{github.sha}
-          export AGENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0+${{ github.sha }}")
           make docker-build-only agent_version=${AGENT_VERSION}
           cat metadata.json
           echo "digest=$(cat metadata.json | jq -r .\"containerimage.digest\")" >> $GITHUB_OUTPUT