fixup! Use Signed Binaries for Docker Build

sheylatrudo · sheylatrudo · commit 828b3ab19654 · 2025-05-15T12:22:29.000-07:00
diff --git a/.pipelines/build/dockerfiles/azure-ipam.Dockerfile b/.pipelines/build/dockerfiles/azure-ipam.Dockerfile
@@ -1,11 +1,11 @@
 ARG ARTIFACT_DIR
 
 FROM scratch AS linux
-COPY ${ARTIFACT_DIR}/bin/dropgz dropgz
+COPY ${ARTIFACT_DIR}/bin/dropgz.exe dropgz
 ENTRYPOINT [ "/dropgz" ]
 
 
 # skopeo inspect docker://mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 --format "{{.Name}}@{{.Digest}}"
 FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as windows
-COPY ${ARTIFACT_DIR}/bin/dropgz dropgz.exe
+COPY ${ARTIFACT_DIR}/bin/dropgz.exe dropgz.exe
 ENTRYPOINT [ "/dropgz.exe" ]
diff --git a/.pipelines/build/dockerfiles/cni.Dockerfile b/.pipelines/build/dockerfiles/cni.Dockerfile
@@ -2,15 +2,13 @@ ARG ARCH
 ARG ARTIFACT_DIR
 
 FROM scratch AS linux
-ADD ${ARTIFACT_DIR}/bin/dropgz dropgz
+ADD ${ARTIFACT_DIR}/bin/dropgz.exe dropgz
 ENTRYPOINT [ "/dropgz" ]
 
 
 # mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
 FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b as hpc
 
 FROM hpc as windows
-ADD ${ARTIFACT_DIR}/bin/dropgz dropgz.exe
+ADD ${ARTIFACT_DIR}/bin/dropgz.exe dropgz.exe
 ENTRYPOINT [ "/dropgz.exe" ]
-
-
diff --git a/.pipelines/build/dockerfiles/cns.Dockerfile b/.pipelines/build/dockerfiles/cns.Dockerfile
@@ -9,15 +9,15 @@ RUN tdnf install -y iptables
 FROM mcr.microsoft.com/cbl-mariner/distroless/minimal@sha256:7778a86d86947d5f64c1280a7ee0cf36c6c6d76b5749dd782fbcc14f113961bf AS linux
 COPY --from=iptables /usr/sbin/*tables* /usr/sbin/
 COPY --from=iptables /usr/lib /usr/lib
-COPY ${ARTIFACT_DIR}/bin/azure-cns /usr/local/bin/azure-cns
+COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /usr/local/bin/azure-cns
 ENTRYPOINT [ "/usr/local/bin/azure-cns" ]
 EXPOSE 10090
 
 
 # mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0
 FROM --platform=windows/${ARCH} mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image@sha256:b4c9637e032f667c52d1eccfa31ad8c63f1b035e8639f3f48a510536bf34032b AS windows
 COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
-COPY ${ARTIFACT_DIR}/files/setkubeconfigpath.ps1 setkubeconfigpath.ps1
-COPY ${ARTIFACT_DIR}/bin/azure-cns /azure-cns.exe
+COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
+COPY ${ARTIFACT_DIR}/bin/azure-cns.exe /azure-cns.exe
 ENTRYPOINT ["azure-cns.exe"]
 EXPOSE 10090
diff --git a/.pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile b/.pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile
@@ -2,7 +2,7 @@ ARG ARTIFACT_DIR
 
 FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
 COPY ${ARTIFACT_DIR}/lib/* /lib
-COPY ${ARTIFACT_DIR}/bin/ipv6-hp-bpf /ipv6-hp-bpf
-COPY ${ARTIFACT_DIR}/bin/nft /usr/sbin/nft
-COPY ${ARTIFACT_DIR}/bin/ip /sbin/ip
+COPY ${ARTIFACT_DIR}/bin/ipv6-hp-bpf.exe /ipv6-hp-bpf
+COPY ${ARTIFACT_DIR}/bin/nft.exe /usr/sbin/nft
+COPY ${ARTIFACT_DIR}/bin/ip.exe /sbin/ip
 CMD ["/ipv6-hp-bpf"]
diff --git a/.pipelines/build/dockerfiles/npm.Dockerfile b/.pipelines/build/dockerfiles/npm.Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
   apt-get autoremove -y && \
   apt-get clean
 
-COPY ${ARTIFACT_DIR}/bin/azure-npm /usr/bin/azure-npm
+COPY ${ARTIFACT_DIR}/bin/azure-npm.exe /usr/bin/azure-npm
 RUN chmod +x /usr/bin/azure-npm
 ENTRYPOINT ["/usr/bin/azure-npm", "start"]
 
@@ -16,8 +16,8 @@ ENTRYPOINT ["/usr/bin/azure-npm", "start"]
 FROM mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as windows
 
 COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
-COPY ${ARTIFACT_DIR}/files/setkubeconfigpath.ps1 setkubeconfigpath.ps1
-COPY ${ARTIFACT_DIR}/files/setkubeconfigpath-capz.ps1 setkubeconfigpath-capz.ps1
-COPY ${ARTIFACT_DIR}/bin/azure-npm npm.exe
+COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath.ps1 setkubeconfigpath.ps1
+COPY ${ARTIFACT_DIR}/scripts/setkubeconfigpath-capz.ps1 setkubeconfigpath-capz.ps1
+COPY ${ARTIFACT_DIR}/bin/azure-npm.exe npm.exe
 
 CMD ["npm.exe", "start" "--kubeconfig=.\\kubeconfig"]
diff --git a/.pipelines/build/scripts/cni.sh b/.pipelines/build/scripts/cni.sh
@@ -12,7 +12,7 @@ export CGO_ENABLED=0
 CNI_NET_DIR="$REPO_ROOT"/cni/network/plugin
 pushd "$CNI_NET_DIR"
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/azure-vnet \
+    -o "$OUT_DIR"/bin/azure-vnet.exe \
     -ldflags "-X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
@@ -21,7 +21,7 @@ popd
 STATELESS_CNI_BUILD_DIR="$REPO_ROOT"/cni/network/stateless
 pushd "$STATELESS_CNI_BUILD_DIR"
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/azure-vnet-stateless \
+    -o "$OUT_DIR"/bin/azure-vnet-stateless.exe \
     -ldflags "-X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
@@ -30,7 +30,7 @@ popd
 CNI_IPAM_DIR="$REPO_ROOT"/cni/ipam/plugin
 pushd "$CNI_IPAM_DIR"
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/azure-vnet-ipam \
+    -o "$OUT_DIR"/bin/azure-vnet-ipam.exe \
     -ldflags "-X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
@@ -39,7 +39,7 @@ popd
 CNI_IPAMV6_DIR="$REPO_ROOT"/cni/ipam/pluginv6
 pushd "$CNI_IPAMV6_DIR"
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/azure-vnet-ipamv6 \
+    -o "$OUT_DIR"/bin/azure-vnet-ipamv6.exe \
     -ldflags "-X main.version="$CNI_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     ./main.go
@@ -48,7 +48,7 @@ popd
 CNI_TELEMETRY_DIR="$REPO_ROOT"/cni/telemetry/service
 pushd "$CNI_TELEMETRY_DIR"
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/azure-vnet-telemetry \
+    -o "$OUT_DIR"/bin/azure-vnet-telemetry.exe \
     -ldflags "-X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
     -gcflags="-dwarflocationlists=true" \
    ./telemetrymain.go
diff --git a/.pipelines/build/scripts/cns.sh b/.pipelines/build/scripts/cns.sh
@@ -7,14 +7,15 @@ export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
+mkdir -p "$OUT_DIR"/scripts
 
 pushd "$REPO_ROOT"/cns
   go build -v -a \
-    -o "$OUT_DIR"/bin/azure-cns \
+    -o "$OUT_DIR"/bin/azure-cns.exe \
     -ldflags "-X main.version="$CNS_VERSION" -X "$CNS_AI_PATH"="$CNS_AI_ID"" \
     -gcflags="-dwarflocationlists=true" \
     service/*.go
   cp kubeconfigtemplate.yaml "$OUT_DIR"/files/kubeconfigtemplate.yaml
-  cp ../npm/examples/windows/setkubeconfigpath.ps1 "$OUT_DIR"/files/setkubeconfigpath.ps1
   cp configuration/cns_config.json "$OUT_DIR"/files/cns_config.json
+  cp ../npm/examples/windows/setkubeconfigpath.ps1 "$OUT_DIR"/scripts/setkubeconfigpath.ps1
 popd
diff --git a/.pipelines/build/scripts/dropgz.sh b/.pipelines/build/scripts/dropgz.sh
@@ -19,6 +19,7 @@ mkdir -p "$DROPGZ_BUILD_DIR"
 echo >&2 "##[section]Construct DropGZ Embedded Payload"
 pushd "$PAYLOAD_DIR"
   [[ -n $(stat "$OUT_DIR"/files 2>/dev/null || true) ]] && cp "$OUT_DIR"/files/* .
+  [[ -n $(stat "$OUT_DIR"/scripts 2>/dev/null || true) ]] && cp "$OUT_DIR"/scripts/* .
   [[ -n $(stat "$OUT_DIR"/bin 2>/dev/null || true) ]] && cp "$OUT_DIR"/bin/* .
   
   sha256sum * > sum.txt
@@ -42,7 +43,7 @@ echo >&2 "##[section]Build DropGZ with Embedded Payload"
 pushd "$DROPGZ_BUILD_DIR"/pkg/mod/"$DROPGZ_MOD_DOWNLOAD_PATH"
   mv "$PAYLOAD_DIR"/* pkg/embed/fs/
   go build -v -trimpath -a \
-    -o "$OUT_DIR"/bin/dropgz \
+    -o "$OUT_DIR"/bin/dropgz.exe \
     -ldflags "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$DROPGZ_VERSION"" \
     -gcflags="-dwarflocationlists=true" \
     main.go
diff --git a/.pipelines/build/scripts/ipv6-hp-bpf.sh b/.pipelines/build/scripts/ipv6-hp-bpf.sh
@@ -12,14 +12,15 @@ mkdir -p "$OUT_DIR"/lib
 # Package up Needed C Files
 if [[ -f /etc/debian_version ]];then
   apt-get update -y
+  apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2
   if [[ $ARCH =~ amd64 ]]; then
-    apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-multilib build-essential binutils 
+    apt-get install -y  gcc-multilib build-essential binutils 
 
     ARCH=x86_64-linux-gnu
     cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
   
   elif [[ $ARCH =~ arm64 ]]; then
-    apt-get install -y llvm clang linux-libc-dev linux-headers-generic libbpf-dev libc6-dev nftables iproute2 gcc-aarch64-linux-gnu
+    apt-get install -y gcc-aarch64-linux-gnu
 
     ARCH=aarch64-linux-gnu
     cp /usr/lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
@@ -32,13 +33,15 @@ if [[ -f /etc/debian_version ]];then
 
 # Mariner
 else
-  tdnf install -y llvm clang libbpf-devel nftables gcc binutils iproute glibc-devel
+  tdnf install -y llvm clang libbpf-devel nftables gcc binutils iproute cross-gcc
   if [[ $ARCH =~ amd64 ]]; then
     ARCH=x86_64-linux-gnu
-    cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
+    #tdnf install -y gcc-x86_64-linux-gnu
+    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
     ARCH=aarch64-linux-gnu
-    cp /usr/lib/"$ARCH"/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/
+    #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 
     if [[ -d $dir ]]; then
@@ -65,8 +68,8 @@ cp /lib/"$ARCH"/libbsd.so.0 "$OUT_DIR"/lib/
 cp /lib/"$ARCH"/libmd.so.0 "$OUT_DIR"/lib/
 
 # Add Needed Binararies
-cp /usr/sbin/nft "$OUT_DIR"/bin/nft
-cp /sbin/ip "$OUT_DIR"/bin/ip
+cp /usr/sbin/nft "$OUT_DIR"/bin/nft.exe
+cp /sbin/ip "$OUT_DIR"/bin/ip.exe
 
 
 # Build IPv6 HP BPF
@@ -79,7 +82,7 @@ pushd "$REPO_ROOT"/bpf-prog/ipv6-hp-bpf
 
   go generate ./...
   go build -v -a -trimpath \
-    -o "$OUT_DIR"/bin/ipv6-hp-bpf \
+    -o "$OUT_DIR"/bin/ipv6-hp-bpf.exe \
     -ldflags "-X main.version="$IPV6_HP_BPF_VERSION"" \
     -gcflags="-dwarflocationlists=true" .
 popd
diff --git a/.pipelines/build/scripts/npm.sh b/.pipelines/build/scripts/npm.sh
@@ -7,15 +7,16 @@ export CGO_ENABLED=0
 
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bin
+mkdir -p "$OUT_DIR"/scripts
 
 pushd "$REPO_ROOT"/npm
   go build -a -v -trimpath \
-    -o "$OUT_DIR"/bin/azure-npm \
+    -o "$OUT_DIR"/bin/azure-npm.exe \
     -ldflags "-X main.version="$NPM_VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" \
     -gcflags="-dwarflocationlists=true" \
     ./cmd/*.go
 
   cp ./examples/windows/kubeconfigtemplate.yaml "$OUT_DIR"/files/kubeconfigtemplate.yaml
-  cp ./examples/windows/setkubeconfigpath.ps1 "$OUT_DIR"/files/setkubeconfigpath.ps1
-  cp ./examples/windows/setkubeconfigpath-capz.ps1 "$OUT_DIR"/files/setkubeconfigpath-capz.ps1
+  cp ./examples/windows/setkubeconfigpath.ps1 "$OUT_DIR"/scripts/setkubeconfigpath.ps1
+  cp ./examples/windows/setkubeconfigpath-capz.ps1 "$OUT_DIR"/scripts/setkubeconfigpath-capz.ps1
 popd
