Skip to content

Commit 08c2a9c

Browse files
committed
fixup! Use Signed Binaries for Docker Build
1 parent 0e57002 commit 08c2a9c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.pipelines/build/scripts/cni.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ popd
3939
CNI_IPAMV6_DIR="$REPO_ROOT"/cni/ipam/pluginv6
4040
pushd "$CNI_IPAMV6_DIR"
4141
go build -v -a -trimpath \
42-
-o "$OUT_DIR"/bin/azure-vnet-ipamv6
42+
-o "$OUT_DIR"/bin/azure-vnet-ipamv6 \
4343
-ldflags "-X main.version="$CNI_VERSION"" \
4444
-gcflags="-dwarflocationlists=true" \
4545
./main.go
@@ -62,8 +62,6 @@ pushd "$REPO_ROOT"/cni
6262
cp azure-$OS-swift-overlay-dualstack.conflist "$OUT_DIR"/files/azure-swift-overlay-dualstack.conflist
6363
cp azure-$OS-multitenancy.conflist "$OUT_DIR"/files/multitenancy.conflist
6464
cp "$REPO_ROOT"/telemetry/azure-vnet-telemetry.config "$OUT_DIR"/files/azure-vnet-telemetry.config
65-
#sha256sum * > sum.txt
66-
#gzip --verbose --best --recursive "$OUT_DIR" && for f in *.gz; do mv -- "$f" "${f%%.gz}"; done
6765
popd
6866

6967
# Build with DropGZ

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,24 @@ mkdir -p "$OUT_DIR"/lib
1313
if [[ -f /etc/debian_version ]];then
1414
apt-get update -y
1515
if [[ $GOARCH =~ amd64 ]]; then
16-
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2
17-
#apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-multilib tree
16+
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-multilib tree
17+
cp /lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
1818
for dir in /usr/include/x86_64-linux-gnu/*; do
1919
ln -sfn "$dir" /usr/include/$(basename "$dir")
2020
done
2121

2222
elif [[ $GOARCH =~ arm64 ]]; then
2323
apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-aarch64-linux-gnu tree
24+
cp /lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
2425
for dir in /usr/include/aarch64-linux-gnu/*; do
2526
ln -sfn "$dir" /usr/include/$(basename "$dir")
2627
done
2728
fi
2829
# Mariner
2930
else
3031
tdnf install -y llvm clang libbpf-devel nftables tree
31-
for dir in /usr/include/aarch64-linux-gnu/*; do
32+
cp /lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
33+
for dir in /usr/include/x86_64-linux-gnu/*; do
3234
if [[ -d $dir ]]; then
3335
ln -sfn "$dir" /usr/include/$(basename "$dir")
3436
elif [[ -f "$dir" ]]; then

0 commit comments

Comments
 (0)