Skip to content

Commit 4aaedc3

Browse files
committed
fixup! Use Signed Binaries for Docker Build
1 parent c868cbb commit 4aaedc3

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

.pipelines/build/images.jobs.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ jobs:
4545
targetPath: $(REPO_ROOT)
4646
artifact: '${{ job_data.templateContext.repositoryArtifact }}'
4747

48+
- task: GoTool@0
49+
inputs:
50+
version: '$(GOVERSION)'
51+
4852
- task: ShellScript@2
4953
inputs:
50-
scriptPath: ${{ job_data.templateContext.buildScript }}
54+
scriptPath: ${{ job_data.templateContext.repositoryArtifact }}/${{ job_data.templateContext.buildScript }}
5155

5256
- task: ExtractFiles@1
5357
inputs:

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,32 @@
33
mkdir -p "$OUT_DIR"/bins
44
mkdir -p "$OUT_DIR"/lib
55

6-
apt-get update -y
7-
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2
6+
if [[ -f /etc/debian_version ]];then
7+
sudo apt-get update -y
8+
if [[ $GOARCH =~ amd64 ]]; then
9+
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2
10+
#apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-multilib tree
11+
for dir in /usr/include/x86_64-linux-gnu/*; do
12+
sudo ln -sfn "$dir" /usr/include/$(basename "$dir")
13+
done
14+
15+
elif [[ $GOARCH =~ arm64 ]]; then
16+
sudo apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-aarch64-linux-gnu tree
17+
for dir in /usr/include/aarch64-linux-gnu/*; do
18+
sudo ln -sfn "$dir" /usr/include/$(basename "$dir")
19+
done
20+
fi
21+
# Mariner
22+
else
23+
sudo tdnf install -y llvm clang libbpf-devel nftables tree
24+
for dir in /usr/include/aarch64-linux-gnu/*; do
25+
if [[ -d $dir ]]; then
26+
sudo ln -sfn "$dir" /usr/include/$(basename "$dir")
27+
elif [[ -f "$dir" ]]; then
28+
sudo ln -Tsfn "$dir" /usr/include/$(basename "$dir")
29+
fi
30+
done
31+
fi
832

933
# Copy Needed Library Binaries
1034
cp /usr/sbin/nft "$OUT_DIR"/bins/nft

0 commit comments

Comments
 (0)