From 618275ecbfc29f382f4f385f9c07754693d84928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 18 Jul 2023 13:14:58 +0200
Subject: [PATCH] Remove ARMv7 build due to errors

---
 scm-packaging/docker/build.gradle    | 23 +----------------------
 scm-packaging/docker/docker-bake.hcl |  2 +-
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/scm-packaging/docker/build.gradle b/scm-packaging/docker/build.gradle
index 66c2415f12..f34a0367a0 100644
--- a/scm-packaging/docker/build.gradle
+++ b/scm-packaging/docker/build.gradle
@@ -77,7 +77,7 @@ task setupBuilder() {
     }
     if (inspect.exitValue != 0) {
       exec {
-        commandLine = ["docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "arm,arm64"]
+        commandLine = ["docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "arm64"]
       }
       exec {
         commandLine = ["docker", "buildx", "create", "--name", "scm-builder", "--driver", "docker-container", "--platform", "linux/arm/v7,linux/arm64/v8,linux/amd64"]
@@ -112,27 +112,6 @@ task pushImages(type: Exec) {
 }
 
 task publish() {
-  doLast {
-    if (!isSnapshot) {
-      // get digest of debian arm v7 image
-      def stdout = new ByteArrayOutputStream()
-      exec {
-        commandLine = ["docker", "buildx", "imagetools", "inspect", "--raw", "${dockerRepository}:${dockerTag}-debian"]
-        standardOutput = stdout
-      }
-      def inspect = new JsonSlurper().parseText(stdout.toString())
-      def manifest = inspect.manifests.find { m -> m.platform.architecture == "arm" }
-
-      // append arm image to manifest with version and without os suffix
-      exec {
-        commandLine = ["docker", "buildx", "imagetools", "create", "--append", "-t", "${dockerRepository}:${dockerTag}", "${dockerRepository}:${dockerTag}-debian@${manifest.digest}"]
-      }
-      // append arm image to latest manifest
-      exec {
-        commandLine = ["docker", "buildx", "imagetools", "create", "--append", "-t", "${dockerRepository}:latest", "${dockerRepository}:${dockerTag}-debian@${manifest.digest}"]
-      }
-    }
-  }
   dependsOn 'pushImages'
 }
 
diff --git a/scm-packaging/docker/docker-bake.hcl b/scm-packaging/docker/docker-bake.hcl
index 3d4de393f8..cda9b0346c 100644
--- a/scm-packaging/docker/docker-bake.hcl
+++ b/scm-packaging/docker/docker-bake.hcl
@@ -82,5 +82,5 @@ target "debian" {
   tags = [
     "${IMAGE}:${VERSION}-debian"
   ]
-  platforms = ["linux/amd64", "linux/arm64/v8", "linux/arm/v7"]
+  platforms = ["linux/amd64", "linux/arm64/v8"]
 }