feat: add image_tag_suffix support

Author: puehringer

.github/workflows/build-docker-artifacts-config.schema.json

@@ -40,6 +40,14 @@
                       "type": "string",
                       "description": "ECR repository to push the image to"
                     },
+                    "image_tag_suffix": {
+                      "type": "string",
+                      "description": "Suffix to append to the image tag"
+                    },
+                    "image_tag_prefix": {
+                      "type": "string",
+                      "description": "Prefix to prepend to the image tag"
+                    },
                     "scan_high_severity": {
                       "type": "boolean",
                       "default": true,
@@ -95,6 +103,14 @@
                   "type": "object",
                   "additionalProperties": false,
                   "properties": {
+                    "image_tag_suffix": {
+                      "type": "string",
+                      "description": "Suffix to append to the image tag"
+                    },
+                    "image_tag_prefix": {
+                      "type": "string",
+                      "description": "Prefix to prepend to the image tag"
+                    },
                     "source_repository": {
                       "type": "string",
                       "description": "Internal ECR repository name"

.github/workflows/build-docker-artifacts.yml

@@ -118,7 +118,6 @@ jobs:
                 build_time: buildTime,
                 image_tag: imageTag,
                 image_tag_branch_name: imageTagBranchName,
-                ecr_repositories: flavor.components.map(component => component.ecr_repository),
                 test_images: {
                   enabled: testImageEnabled,
                   script_path: testImagesHookScript,
@@ -247,6 +246,8 @@ jobs:
           # Disable provenance as it creates weird multi-arch images: https://github.com/docker/build-push-action/issues/755
           provenance: false
           # Disable the cache to avoid outdated (base) images
+          # TODO: are we sure we want this? We might benefit a lot from caching! But also, our base images like datavisyn/base/python:main are updated frequently and have no version tag...
+          # maybe no-cache-filters works? Or we do this on our self-hosted runners: https://docs.docker.com/build/ci/github-actions/cache/#local-cache
           no-cache: true
           build-args: |
             GIT_BRANCH=${{ steps.get-branch.outputs.branch }}
@@ -432,13 +433,19 @@ jobs:
           echo "image_tag=$image_tag"
           echo "image_tag_branch_name=$image_tag_branch_name"
 
-          for repository_name in $(jq -r '.ecr_repositories[]' <<< "$FLAVOR"); do
-            IMAGE_META=$(aws ecr describe-images --repository-name "$repository_name" --image-ids imageTag="$image_tag" --output json | jq --arg var "${image_tag_branch_name}" '.imageDetails[0].imageTags | index( $var )')
-            if [[ -z "${IMAGE_META}" || ${IMAGE_META} == "null" ]]; then
+          for component in $(jq -c '.components[]' <<< "$FLAVOR"); do
+            repository_name=$(jq -r '.ecr_repository' <<< "$component")
+            image_tag=$(jq -r '.image_tag' <<< "$component")
+            image_tag_branch_name=$(jq -r '.image_tag_branch_name' <<< "$component")
+
+            echo "Processing repository: $repository_name, image_tag: $image_tag, image_tag_branch_name: $image_tag_branch_name"
+
+            IMAGE_META=$(aws ecr describe-images --repository-name "$repository_name" --image-ids imageTag="$image_tag" --output json | jq --arg var "${image_tag_branch_name}" '.imageDetails[0].imageTags | index($var)')
+            if [[ -z "${IMAGE_META}" || "${IMAGE_META}" == "null" ]]; then
               MANIFEST=$(aws ecr batch-get-image --repository-name "$repository_name" --image-ids imageTag="$image_tag" --output json | jq --raw-output --join-output '.images[0].imageManifest')
               aws ecr put-image --repository-name "$repository_name" --image-tag "$image_tag_branch_name" --image-manifest "$MANIFEST"
             else
-              echo "image already tagged!"
+              echo "Image already tagged for repository: $repository_name!"
             fi
           done;
         env: