From c4c22fa2a090575ba2985d62e6677276ab70a19d Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 6 Feb 2024 09:38:22 -0500
Subject: [PATCH] Build multi-arch image.

This will build only those architectures that we have runners to build on
---
 .gitlab-ci.yml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5187fad..7744528 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,27 +300,6 @@ build-container:
       --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
       --destination "${CI_REGISTRY_IMAGE}:${TAG}_${ARCH}"
 
-merge-manifests:
-  variables:
-    TAG: latest
-  stage: container-build
-  needs:
-    - job: build-container
-      artifacts: false
-  image:
-      name: mplatform/manifest-tool:alpine
-      entrypoint: [""]
-  script:
-    - if [ -n "$CI_COMMIT_TAG" ]; then export TAG="$CI_COMMIT_TAG"; fi
-    - >-
-      manifest-tool
-      --username="${CI_REGISTRY_USER}"
-      --password="${CI_REGISTRY_PASSWORD}"
-      push from-args
-      --platforms linux/amd64,linux/arm64,linux/s390x
-      --template "${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}_ARCH"
-      --target "${CI_REGISTRY_IMAGE}:${TAG}"
-
 merge-manifests:
   variables:
     TAG: latest
@@ -341,4 +320,3 @@ merge-manifests:
       --platforms linux/amd64,linux/arm64,linux/s390x
       --template "${CI_REGISTRY_IMAGE}:${TAG}_ARCH"
       --target "${CI_REGISTRY_IMAGE}:${TAG}"
-