From 43916de0b719bcd087fe9d4073b58e772e72f679 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 13 Dec 2024 08:14:04 +0100
Subject: [PATCH] Next batch of arm64

---
 tools/gcloud/Dockerfile.template        | 18 +++++++++++++++++-
 tools/gcloud/manifest.yaml              |  2 +-
 tools/gnuplot/manifest.yaml             |  2 +-
 tools/sonar-scanner/Dockerfile.template |  2 +-
 tools/sonar-scanner/manifest.yaml       |  2 +-
 tools/tshark/manifest.yaml              |  2 +-
 tools/vscode-cli/Dockerfile.template    |  2 +-
 tools/vscode-cli/manifest.yaml          |  2 +-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tools/gcloud/Dockerfile.template b/tools/gcloud/Dockerfile.template
index 25d07f2a5b..c89a8718a1 100644
--- a/tools/gcloud/Dockerfile.template
+++ b/tools/gcloud/Dockerfile.template
@@ -9,7 +9,23 @@ ARG name
 ARG version
 WORKDIR /uniget_bootstrap/opt/gcloud
 RUN --mount=type=cache,target=/var/cache/uniget/download <<EOF
-url="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${version}-linux-${arch}.tar.gz"
+echo "### Setting architecture string for ${TARGETPLATFORM}"
+case "${arch}" in
+    x86_64)
+        export arch_suffix="${arch}"
+        ;;
+    aarch64)
+        export arch_suffix="arm"
+        ;;
+    *)
+        echo "ERROR: Unsupported architecture ${arch}."
+        exit 1
+        ;;
+esac
+echo "    Using ${arch_suffix}"
+
+# https://cloud.google.com/sdk/docs/downloads-versioned-archives?hl=de
+url="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${version}-linux-${arch_suffix}.tar.gz"
 filename="$( basename "${url}" )"
 
 check-download "${url}"
diff --git a/tools/gcloud/manifest.yaml b/tools/gcloud/manifest.yaml
index 9255d0c05f..47c3a30e21 100644
--- a/tools/gcloud/manifest.yaml
+++ b/tools/gcloud/manifest.yaml
@@ -6,7 +6,7 @@ runtime_dependencies:
 - python
 platforms:
 - linux/amd64
-#- linux/arm64
+- linux/arm64
 tags:
 - org/google
 - category/development
diff --git a/tools/gnuplot/manifest.yaml b/tools/gnuplot/manifest.yaml
index c5b7af5ad3..7049c2f8d6 100644
--- a/tools/gnuplot/manifest.yaml
+++ b/tools/gnuplot/manifest.yaml
@@ -5,7 +5,7 @@ version: "5.4.8"
 check: ${binary} --version | cut -d' ' -f2- | tr '[a-z ]' '.' | tr -s .
 platforms:
 - linux/amd64
-#- linux/arm64
+- linux/arm64
 tags:
 - category/development
 - lang/c
diff --git a/tools/sonar-scanner/Dockerfile.template b/tools/sonar-scanner/Dockerfile.template
index 63f4b20be6..a7cabce365 100644
--- a/tools/sonar-scanner/Dockerfile.template
+++ b/tools/sonar-scanner/Dockerfile.template
@@ -13,7 +13,7 @@ case "${arch}" in
         export arch_suffix=x64
         ;;
     aarch64)
-        export arch_suffix=arm64
+        export arch_suffix=${arch}
         ;;
     *)
         echo "ERROR: Unsupported architecture ${arch}."
diff --git a/tools/sonar-scanner/manifest.yaml b/tools/sonar-scanner/manifest.yaml
index dd484c9165..1797dd64df 100644
--- a/tools/sonar-scanner/manifest.yaml
+++ b/tools/sonar-scanner/manifest.yaml
@@ -6,7 +6,7 @@ runtime_dependencies:
 - openjdk-jre
 platforms:
 - linux/amd64
-#- linux/arm64
+- linux/arm64
 tags:
 - org/sonarsource
 - type/cli
diff --git a/tools/tshark/manifest.yaml b/tools/tshark/manifest.yaml
index 03f06037b4..00983ef3ff 100644
--- a/tools/tshark/manifest.yaml
+++ b/tools/tshark/manifest.yaml
@@ -8,7 +8,7 @@ build_dependencies:
 - speexdsp
 platforms:
 - linux/amd64
-#- linux/arm64
+- linux/arm64
 tags:
 - org/wireshark
 - category/operations
diff --git a/tools/vscode-cli/Dockerfile.template b/tools/vscode-cli/Dockerfile.template
index 88263bc4f7..42dc2766a0 100644
--- a/tools/vscode-cli/Dockerfile.template
+++ b/tools/vscode-cli/Dockerfile.template
@@ -1,6 +1,6 @@
 #syntax=docker/dockerfile:1.12.0@sha256:db1ff77fb637a5955317c7a3a62540196396d565f3dd5742e76dddbb6d75c4c5
 
-FROM registry.gitlab.com/uniget-org/images/ubuntu:24.04 AS prepare
+FROM registry.gitlab.com/uniget-org/images/ubuntu:rolling AS prepare
 COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
diff --git a/tools/vscode-cli/manifest.yaml b/tools/vscode-cli/manifest.yaml
index 9f6b89c3d7..a1bf13a5fc 100644
--- a/tools/vscode-cli/manifest.yaml
+++ b/tools/vscode-cli/manifest.yaml
@@ -6,7 +6,7 @@ binary: code
 check: ${binary} --version | cut -d' ' -f2
 platforms:
 - linux/amd64
-#- linux/arm64
+- linux/arm64
 tags:
 - org/microsoft
 - category/development