fixup! Use Signed Binaries for Docker Build

Author: sheylatrudo

.pipelines/build/images.jobs.yaml

@@ -10,9 +10,6 @@ jobs:
     strategy: ${{ job_data.strategy }}
     pool:
       type: linux
-      ${{ if eq(job_data.job, 'linux_arm64') }}:
-        hostArchitecture: arm64
-
     variables:
       ob_artifactSuffix: _$(name)
       ob_git_checkout: false
@@ -25,22 +22,22 @@ jobs:
       ob_outputDirectory: $(Build.ArtifactStagingDirectory)
       ${{ if eq(job_data.job, 'linux_amd64') }}:
         LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
-        ARCH: amd64
-        GOARCH: amd64
         OS: linux
+        ARCH: amd64
         GOOS: linux
+        GOARCH: amd64
       ${{ elseif eq(job_data.job, 'windows_amd64') }}:
         LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
-        ARCH: amd64
-        GOARCH: amd64
         OS: windows
+        ARCH: amd64
         GOOS: windows
+        GOARCH: amd64
       ${{ elseif eq(job_data.job, 'linux_arm64') }}:
         ob_enable_qemu: true
-        ARCH: arm64
-        GOARCH: arm64
         OS: linux
+        ARCH: amd64
         GOOS: linux
+        GOARCH: arm64
     steps:
     - task: DownloadPipelineArtifact@2
       inputs:

.pipelines/build/scripts/ipv6-hp-bpf.sh

@@ -34,15 +34,14 @@ if [[ -f /etc/debian_version ]];then
 
 
 # Mariner
+# This is not set up to build on arm _hosts_
 else
-  tdnf install -y llvm clang libbpf-devel nftables gcc binutils iproute
-  if [[ $ARCH =~ amd64 ]]; then
+  tdnf install -y llvm clang libbpf-devel nftables gcc binutils iproute cross-gcc
+  if [[ $GOARCH =~ amd64 ]]; then
     ARCH=x86_64-linux-gnu
-    tdnf install -y cross-gcc
     cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/ || find /usr/lib/ -name 'ld-linux-x86-64.so.2'
-  elif [[ $ARCH =~ arm64 ]]; then
+  elif [[ $GOARCH =~ arm64 ]]; then
     ARCH=aarch64-linux-gnu
-    tdnf install -y gcc-aarch64-linux-gnu
     cp /usr/lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/ || find /usr/lib/ -name 'ld-linux-aarch64.so.1'
   fi
   for dir in /usr/include/"$ARCH"/*; do