Skip to content

Commit c3eea89

Browse files
committed
fixup! Use Signed Binaries for Docker Build
1 parent 18eb019 commit c3eea89

File tree

7 files changed

+10
-21
lines changed

7 files changed

+10
-21
lines changed

.pipelines/build/images.jobs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
DROPGZ_VERSION: v0.0.12
2121
DEBUG: $[ coalesce(variables['System.Debug'], 'False') ]
2222
ob_outputDirectory: $(Build.ArtifactStagingDirectory)
23+
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
2324
${{ if eq(job_data.job, 'linux_amd64') }}:
24-
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
2525
OS: linux
2626
ARCH: amd64
2727
GOOS: linux
2828
GOARCH: amd64
2929
${{ elseif eq(job_data.job, 'windows_amd64') }}:
30-
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
31-
OS: windows
30+
ob_enable_qemu: true
31+
OS: linux
3232
ARCH: amd64
3333
GOOS: windows
3434
GOARCH: amd64

.pipelines/build/scripts/azure-ipam.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
4+
[[ $GOOS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export GOOS=$OS
7-
export GOARCH=$ARCH
86
export CGO_ENABLED=0
97

108
mkdir -p "$OUT_DIR"/bin

.pipelines/build/scripts/cni.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='exe' || FILE_EXT='bin'
4+
[[ $GOOS =~ windows ]] && FILE_EXT='exe' || FILE_EXT='bin'
55

66
mkdir -p "$OUT_DIR"/files
77
mkdir -p "$OUT_DIR"/bin
88

9-
export GOOS=$OS
10-
export GOARCH=$ARCH
119
export CGO_ENABLED=0
1210

1311

.pipelines/build/scripts/cns.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
4+
[[ $GOOS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export GOOS=$OS
7-
export GOARCH=$ARCH
86
export CGO_ENABLED=0
97

108
mkdir -p "$OUT_DIR"/files

.pipelines/build/scripts/dropgz.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
4+
[[ $GOOS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export GOOS=$OS
7-
export GOARCH=$ARCH
86
export CGO_ENABLED=0
97

108
mkdir -p "$GEN_DIR"

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
4+
[[ $GOOS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export GOOS=$OS
7-
export GOARCH=$ARCH
86
export CGO_ENABLED=0
97
export C_INCLUDE_PATH=/usr/include/bpf
108

@@ -20,6 +18,7 @@ if [[ -f /etc/debian_version ]];then
2018

2119
ARCH=x86_64-linux-gnu
2220
cp /usr/lib/"$ARCH"/ld-linux-x86-64.so.2 "$OUT_DIR"/lib/
21+
cp /usr/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1 "$OUT_DIR"/lib/ || echo "Skipped."
2322

2423
elif [[ $ARCH =~ arm64 ]]; then
2524
apt-get install -y gcc-aarch64-linux-gnu

.pipelines/build/scripts/npm.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/bin/bash
22
set -eux
33

4-
[[ $OS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
4+
[[ $GOOS =~ windows ]] && FILE_EXT='.exe' || FILE_EXT=''
55

6-
export GOOS=$OS
7-
export GOARCH=$ARCH
86
export CGO_ENABLED=0
97

108
mkdir -p "$OUT_DIR"/files

0 commit comments

Comments
 (0)