fixup! Use Signed Binaries for Docker Build

Author: sheylatrudo

.pipelines/build/dockerfiles/cns.Dockerfile

@@ -1,5 +1,5 @@
 ARG ARCH
-ARG ARCHIVE_DIR
+ARG ARTIFACT_DIR
 
 # mcr.microsoft.com/cbl-mariner/base/core:2.0
 FROM mcr.microsoft.com/cbl-mariner/base/core@sha256:961bfedbbbdc0da51bc664f51d959da292eced1ad46c3bf674aba43b9be8c703 AS iptables
@@ -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 ${ARCHIVE_DIR}/bins/azure-cns /usr/local/bin/azure-cns
+COPY ${ARTIFACT_DIR}/bins/azure-cns /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 ${ARCHIVE_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
-COPY ${ARCHIVE_DIR}/files/setkubeconfigpath.ps1 setkubeconfigpath.ps1
-COPY ${ARCHIVE_DIR}/bins/azure-cns /azure-cns.exe
+COPY ${ARTIFACT_DIR}/files/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
+COPY ${ARTIFACT_DIR}/files/setkubeconfigpath.ps1 setkubeconfigpath.ps1
+COPY ${ARTIFACT_DIR}/bins/azure-cns /azure-cns.exe
 ENTRYPOINT ["azure-cns.exe"]
 EXPOSE 10090

.pipelines/build/dockerfiles/ipv6-hp-bpf.Dockerfile

@@ -1,8 +1,8 @@
-ARG ARCHIVE_DIR
+ARG ARTIFACT_DIR
 
 FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0 AS linux
-COPY ${ARCHIVE_DIR}/lib/* /lib
-COPY ${ARCHIVE_DIR}/bins/ipv6-hp-bpf /ipv6-hp-bpf
-COPY ${ARCHIVE_DIR}/bins/nft /usr/sbin/nft
-COPY ${ARCHIVE_DIR}/bins/ip /sbin/ip
+COPY ${ARTIFACT_DIR}/lib/* /lib
+COPY ${ARTIFACT_DIR}/bins/ipv6-hp-bpf /ipv6-hp-bpf
+COPY ${ARTIFACT_DIR}/bins/nft /usr/sbin/nft
+COPY ${ARTIFACT_DIR}/bins/ip /sbin/ip
 CMD ["/ipv6-hp-bpf"]

.pipelines/build/images.jobs.yaml

@@ -115,6 +115,6 @@ jobs:
         name: $(name)
         dockerfile_path: ${{ job_data.templateContext.pkgArtifact }}
         build_tag: $(imageTag)
-        extra_args: $(extraArgs)
+        extra_args: $(extraArgs) --build-arg ARTIFACT_DIR="${{ job_data.templateContext.pkgArtifact }}"
         archive_file: $(archiveName)-$(OS)-$(ARCH)-$(archiveVersion)
         source: ${{ job_data.templateContext.pkgArtifact }}

.pipelines/build/scripts/cni.sh

@@ -10,14 +10,14 @@ export GOOS=$OS
 export GOARCH=$ARCH
 export CGO_ENABLED=0 
 
-CNI_BUILD_DIR="$BUILD_DIR"/cni
+CNI_BUILD_DIR="$REPO_ROOT"/cni
 STATELESS_CNI_BUILD_DIR="$CNI_BUILD_DIR"/stateless
-CNI_MULTITENANCY_BUILD_DIR="$BUILD_DIR"/cni-multitenancy
-CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR="$BUILD_DIR"/cni-multitenancy-transparent-vlan
-CNI_SWIFT_BUILD_DIR="$BUILD_DIR"/cni-swift
-CNI_OVERLAY_BUILD_DIR="$BUILD_DIR"/cni-overlay
-CNI_BAREMETAL_BUILD_DIR="$BUILD_DIR"/cni-baremetal
-CNI_DUALSTACK_BUILD_DIR="$BUILD_DIR"/cni-dualstack
+CNI_MULTITENANCY_BUILD_DIR="$REPO_ROOT"/cni-multitenancy
+CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR="$REPO_ROOT"/cni-multitenancy-transparent-vlan
+CNI_SWIFT_BUILD_DIR="$REPO_ROOT"/cni-swift
+CNI_OVERLAY_BUILD_DIR="$REPO_ROOT"/cni-overlay
+CNI_BAREMETAL_BUILD_DIR="$REPO_ROOT"/cni-baremetal
+CNI_DUALSTACK_BUILD_DIR="$REPO_ROOT"/cni-dualstack
 
 CNI_TEMP_DIR=$(mktemp -d -p "$GEN_DIR")
 

.pipelines/build/scripts/cns.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
 set -nex
 
+export GOOS=$OS
+export GOARCH=$ARCH
+export CGO_ENABLED=0 
+
 mkdir -p "$OUT_DIR"/files
 mkdir -p "$OUT_DIR"/bins
 
 pushd "$REPO_ROOT"/cns
-  GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/azure-cns -ldflags "-X main.version="$VERSION" -X "$CNS_AI_PATH"="$CNS_AI_ID"" -gcflags="-dwarflocationlists=true" service/*.go
+  go build -v -a \
+    -o "$OUT_DIR"/bins/azure-cns \
+    -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