Skip to content

Commit 46c56e3

Browse files
committed
fixup! Use Signed Binaries for Docker Build
1 parent fa4cf77 commit 46c56e3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.pipelines/build/images.jobs.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ jobs:
1010
strategy: ${{ job_data.strategy }}
1111
pool:
1212
type: linux
13+
${{ if eq(job_data.job, 'linux_arm64') }}:
14+
hostArchitecture: arm64
15+
1316
variables:
1417
ob_artifactSuffix: _$(name)
1518
ob_git_checkout: false
@@ -35,7 +38,7 @@ jobs:
3538
${{ elseif eq(job_data.job, 'linux_arm64') }}:
3639
ob_enable_qemu: true
3740
OS: linux
38-
ARCH: amd64
41+
ARCH: arm64
3942
GOOS: linux
4043
GOARCH: arm64
4144
steps:

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ mkdir -p "$OUT_DIR"/lib
1313
if [[ -f /etc/debian_version ]];then
1414
apt-get update -y
1515
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2
16-
if [[ $GOARCH =~ amd64 ]]; then
17-
apt-get install -y gcc-multilib build-essential binutils
16+
if [[ $ARCH =~ amd64 ]]; then
17+
apt-get install -y gcc-multilib
1818

1919
ARCH=x86_64-linux-gnu
2020
cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
2121

22-
elif [[ $GOARCH =~ arm64 ]]; then
22+
elif [[ $ARCH =~ arm64 ]]; then
2323
apt-get install -y gcc-aarch64-linux-gnu
2424

2525
ARCH=aarch64-linux-gnu
@@ -35,7 +35,6 @@ if [[ -f /etc/debian_version ]];then
3535

3636

3737
# Mariner
38-
# This is not set up to build on arm _hosts_
3938
else
4039
tdnf install -y llvm clang libbpf-devel nftables gcc binutils iproute glibc
4140
if [[ $GOARCH =~ amd64 ]]; then

0 commit comments

Comments
 (0)