Split prefix and suffix, create multiarch manifest

Signed-off-by: Federico Busetti <[email protected]>

Author: febus982

.gitlab_ci/_templates.yml

@@ -2,7 +2,8 @@ variables:
   DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE
   DOCKER_IMAGE_TAG: $CI_COMMIT_SHA
   DOCKER_IMAGE_TAG_PREFIX: ""
-  DOCKER_IMAGE_FULL_TAG: $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG_PREFIX$DOCKER_IMAGE_TAG
+  DOCKER_IMAGE_TAG_SUFFIX: ""
+  DOCKER_IMAGE_FULL_TAG: $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG_PREFIX$DOCKER_IMAGE_TAG$DOCKER_IMAGE_TAG_SUFFIX
 
 # Build Docker image for test
 # TODO: Sign image using Cosign
@@ -31,6 +32,18 @@ variables:
       --cache-to type=registry,ref=$DOCKER_IMAGE_NAME:cache \
       .
 
+# Architectures are hardcoded for multiarch, need to make this better
+.multiarch-manifest-gitlab:
+  image: docker:24.0.2
+  services:
+    - docker:24.0.2-dind
+  script:
+    - docker manifest create $DOCKER_IMAGE_FULL_TAG \
+      --amend $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG_PREFIX$DOCKER_IMAGE_TAG-amd64 \
+      --amend $DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG_PREFIX$DOCKER_IMAGE_TAG-arm64
+
+    - docker manifest push $DOCKER_IMAGE_FULL_TAG
+
 .python-typing:
   image: $DOCKER_IMAGE_FULL_TAG
   script:

.gitlab_ci/build.yml

@@ -13,7 +13,9 @@ build-test:
 build-http-app-amd64:
   stage: build
   variables:
-    DOCKER_IMAGE_TAG_PREFIX: "http-amd64-"
+    DOCKER_IMAGE_TAG_PREFIX: "http-"
+    DOCKER_IMAGE_TAG_SUFFIX: "-amd64"
+    DOCKER_PLATFORM: "linux/amd64"
     DOCKER_TARGET: http_app
   tags:
     - saas-linux-small-amd64
@@ -27,7 +29,8 @@ build-http-app-amd64:
 build-http-app-arm64:
   stage: build
   variables:
-    DOCKER_IMAGE_TAG_PREFIX: "http-arm64-"
+    DOCKER_IMAGE_TAG_PREFIX: "http-"
+    DOCKER_IMAGE_TAG_SUFFIX: "-arm64"
     DOCKER_PLATFORM: "linux/arm64"
     DOCKER_TARGET: http_app
   tags:
@@ -38,3 +41,17 @@ build-http-app-arm64:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   extends:
     - .build-and-push-gitlab
+
+aggregate-http-manifests:
+  stage: build
+  needs:
+    - build-http-app-amd64
+    - build-http-app-arm64
+  variables:
+    DOCKER_IMAGE_TAG_PREFIX: "http-"
+  rules:
+    # We run the pipeline only on merge requests or the `main` branch
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  extends:
+    - .build-and-push-gitlab