Skip to content

Commit cd24315

Browse files
sheylatrudosheylatrudo
committed
fixup! Use Signed Binaries for Docker Build
1 parent dbec508 commit cd24315

File tree

3 files changed

+79
-19
lines changed

3 files changed

+79
-19
lines changed

‎.pipelines/build/images.jobs.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ jobs:
5454
inputs:
5555
scriptPath: ${{ job_data.templateContext.repositoryArtifact }}/${{ job_data.templateContext.buildScript }}
5656

57-
- task: ExtractFiles@1
58-
inputs:
59-
archiveFilePatterns: '**/*.?(tgz|tgz.gz|zip)'
60-
destinationFolder: $(OUT_DIR)
61-
cleanDestinationFolder: false
62-
overwriteExistingFiles: true
57+
# - task: ExtractFiles@1
58+
# inputs:
59+
# archiveFilePatterns: '**/*.?(tgz|tgz.gz|zip)'
60+
# destinationFolder: $(OUT_DIR)
61+
# cleanDestinationFolder: false
62+
# overwriteExistingFiles: true
6363

6464
- script: |
6565
cp "$SOURCE" "$DEST"

‎.pipelines/build/scripts/cni.sh‎

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,67 @@ ls -la
66
mkdir -p "$OUT_DIR"/files
77
mkdir -p "$OUT_DIR"/bins
88

9-
#CNI_BUILD_DIR=$(mktemp -d -p "$GEN_DIR")
9+
export GOOS=$OS
10+
export GOARCH=$ARCH
11+
export CGO_ENABLED=0
1012

11-
pushd "$REPO_ROOT"/cni
12-
GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/azure-vnet -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" network/plugin/main.go
13-
GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/azure-vnet-telemetry -trimpath -ldflags "-X main.version="$VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" -gcflags="-dwarflocationlists=true" ../telemetry/service/telemetrymain.go
14-
GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/azure-vnet-ipam -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" ipam/plugin/main.go
15-
GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/azure-vnet-stateless -trimpath -ldflags "-X main.version="$VERSION"" -gcflags="-dwarflocationlists=true" network/stateless/main.go
13+
CNI_BUILD_DIR="$BUILD_DIR"/cni
14+
STATELESS_CNI_BUILD_DIR="$CNI_BUILD_DIR"/stateless
15+
CNI_MULTITENANCY_BUILD_DIR="$BUILD_DIR"/cni-multitenancy
16+
CNI_MULTITENANCY_TRANSPARENT_VLAN_BUILD_DIR="$BUILD_DIR"/cni-multitenancy-transparent-vlan
17+
CNI_SWIFT_BUILD_DIR="$BUILD_DIR"/cni-swift
18+
CNI_OVERLAY_BUILD_DIR="$BUILD_DIR"/cni-overlay
19+
CNI_BAREMETAL_BUILD_DIR="$BUILD_DIR"/cni-baremetal
20+
CNI_DUALSTACK_BUILD_DIR="$BUILD_DIR"/cni-dualstack
21+
22+
CNI_TEMP_DIR=$(mktemp -d -p "$GEN_DIR")
23+
24+
CNI_NET_DIR="$REPO_ROOT"/cni/network/plugin
25+
pushd "$CNI_NET_DIR"
26+
go build -v -a -trimpath \
27+
-o "$OUT_DIR"/bins/azure-vnet \
28+
-ldflags "-X main.version="$CNI_VERSION"" \
29+
-gcflags="-dwarflocationlists=true" \
30+
./main.go
31+
popd
32+
33+
STATELESS_CNI_NET_DIR="$REPO_ROOT"/cni/network/stateless
34+
pushd "$STATELESS_CNI_NET_DIR"
35+
go build -v -a -trimpath \
36+
-o "$OUT_DIR"/bins/azure-vnet-stateless \
37+
-ldflags "-X main.version="$CNI_VERSION"" \
38+
-gcflags="-dwarflocationlists=true" \
39+
./main.go
40+
popd
41+
42+
CNI_IPAM_DIR="$REPO_ROOT"/cni/ipam/plugin
43+
pushd "$CNI_IPAM_DIR"
44+
go build -v -a -trimpath \
45+
-o "$OUT_DIR"/bins/azure-vnet-ipam \
46+
-ldflags "-X main.version="$CNI_VERSION"" \
47+
-gcflags="-dwarflocationlists=true" \
48+
./main.go
49+
popd
1650

51+
CNI_IPAMV6_DIR="$REPO_ROOT"/cni/ipam/pluginv6
52+
pushd "$CNI_IPAMV6_DIR"
53+
go build -v -a -trimpath \
54+
-o "$OUT_DIR"/bins/azure-vnet-ipamv6
55+
-ldflags "-X main.version="$CNI_VERSION"" \
56+
-gcflags="-dwarflocationlists=true" \
57+
./main.go
58+
popd
59+
60+
CNI_TELEMETRY_DIR="$REPO_ROOT"/cni/telemetry/service
61+
pushd "$CNI_TELEMETRY_DIR"
62+
go build -v -a -trimpath \
63+
-o "$OUT_DIR"/bins/azure-vnet-telemetry \
64+
-ldflags "-X main.version="$CNI_VERSION" -X "$CNI_AI_PATH"="$CNI_AI_ID"" \
65+
-gcflags="-dwarflocationlists=true" \
66+
./telemetrymain.go
67+
popd
68+
69+
pushd "$REPO_ROOT"/cni
1770
cp azure-$OS.conflist "$OUT_DIR"/files/azure.conflist
1871
cp azure-$OS-swift.conflist "$OUT_DIR"/files/azure-swift.conflist
1972
cp azure-linux-multitenancy-transparent-vlan.conflist "$OUT_DIR"/files/azure-multitenancy-transparent-vlan.conflist
@@ -22,12 +75,19 @@ pushd "$REPO_ROOT"/cni
2275
cp azure-$OS-multitenancy.conflist "$OUT_DIR"/files/multitenancy.conflist
2376
cp ../telemetry/azure-vnet-telemetry.config "$OUT_DIR"/files/azure-vnet-telemetry.config
2477
sha256sum * > sum.txt
25-
gzip --verbose --best --recursive "$OUT_DIR" && for f in *.gz; do mv -- "$f" "${f%%.gz}"; done
78+
#gzip --verbose --best --recursive "$OUT_DIR" && for f in *.gz; do mv -- "$f" "${f%%.gz}"; done
2679
popd
2780

28-
go mod download github.com/azure/azure-container-networking/dropgz@$DROPGZ_VERSION
29-
pushd "$GOPATH"/pkg/mod/github.com/azure/azure-container-networking/dropgz\@$DROPGZ_VERSION
81+
82+
mkdir -p "$CNI_TEMP_DIR"
83+
GOPATH="$CNI_TEMP_DIR" go mod download github.com/azure/azure-container-networking/dropgz@$DROPGZ_VERSION
84+
85+
pushd "$CNI_TEMP_DIR"/pkg/mod/github.com/azure/azure-container-networking/dropgz\@$DROPGZ_VERSION
3086
cp "$OUT_DIR"/files/* pkg/embed/fs/
3187
cp "$OUT_DIR"/bins/* pkg/embed/fs/
32-
GOOS=$OS CGO_ENABLED=0 go build -a -o "$OUT_DIR"/bins/dropgz -trimpath -ldflags "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$VERSION"" -gcflags="-dwarflocationlists=true" main.go
88+
go build -a \
89+
-o "$OUT_DIR"/bins/dropgz \
90+
-ldflags "-X github.com/Azure/azure-container-networking/dropgz/internal/buildinfo.Version="$VERSION"" \
91+
-gcflags="-dwarflocationlists=true" \
92+
./main.go
3393
popd

‎.pipelines/run-pipeline.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ stages:
125125
displayName: "Linux/AMD64"
126126
templateContext:
127127
repositoryArtifact: drop_setup_env_source
128-
pkgArtifact: drop_pkg_linux_amd64_$(name)
128+
pkgArtifact: drop_build_pkg_$(os)_$(arch)_$(name)
129129
buildScript: .pipelines/build/scripts/$(name).sh
130130
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
131131
strategy:
@@ -166,7 +166,7 @@ stages:
166166
displayName: "Windows"
167167
templateContext:
168168
repositoryArtifact: drop_setup_env_source
169-
pkgArtifact: drop_pkg_windows_amd64_$(name)
169+
pkgArtifact: drop_build_pkg_$(os)_$(arch)_$(name)
170170
buildScript: .pipelines/build/scripts/$(name).sh
171171
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
172172
strategy:
@@ -201,7 +201,7 @@ stages:
201201
displayName: "Linux/ARM64"
202202
templateContext:
203203
repositoryArtifact: drop_setup_env_source
204-
pkgArtifact: drop_pkg_linux_arm64_$(name)
204+
pkgArtifact: drop_build_pkg_$(os)_$(arch)_$(name)
205205
buildScript: .pipelines/build/scripts/$(name).sh
206206
obDockerfile: .pipelines/build/dockerfiles/$(name).Dockerfile
207207
strategy:

0 commit comments

Comments
 (0)