Skip to content

Commit 7022b52

Browse files
committed
fixup! Use Signed Binaries for Docker Build
1 parent 91bc0cd commit 7022b52

File tree

7 files changed

+11
-34
lines changed

7 files changed

+11
-34
lines changed

.pipelines/build/image.steps.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ parameters:
1515
type: string
1616
default: ""
1717

18-
- name: dockerfile_path
19-
type: string
20-
default: ""
21-
2218
- name: archive_file
2319
type: string
2420
default: '$(name)-$(os)-$(platform)-$(Tag)'
@@ -70,7 +66,7 @@ steps:
7066
repositoryName: $(os)-$(arch)/${{ parameters.name }}
7167
os: '${{ parameters.os }}'
7268
buildkit: 1
73-
dockerFileRelPath: ${{ parameters.dockerfile_path }}/Dockerfile
69+
dockerFileRelPath: Dockerfile
7470
dockerFileContextPath: ${{ parameters.source }}
7571
enable_network: true
7672
enable_pull: true

.pipelines/build/images.jobs.yaml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,10 @@ jobs:
5050
inputs:
5151
version: '$(GOVERSION)'
5252

53-
- bash: |
54-
echo "Start"
55-
set -x
56-
echo "List"
57-
ls -la
58-
ls -la .pipelines
59-
ls -la .pipelines/build
60-
ls -la .pipelines/build/scripts
61-
ls -la .pipelines/build/dockerfiles
62-
echo "Chown"
63-
chmod +x "$SCRIPT_SRC"
64-
echo "Execute"
65-
./"$SCRIPT_SRC"
66-
displayName: "Build Package"
67-
workingDirectory: $(REPO_ROOT)
68-
env:
69-
SCRIPT_SRC: ${{ job_data.templateContext.buildScript }}
53+
- task: ShellScript@2
54+
inputs:
55+
scriptPath: '${{ job_data.templateContext.buildScript }}'
56+
workingDirectory: $(REPO_ROOT)
7057

7158
# - task: ExtractFiles@1
7259
# inputs:
@@ -76,9 +63,9 @@ jobs:
7663
# overwriteExistingFiles: true
7764

7865
- script: |
66+
ls -la "$SOURCE"
7967
cp "$SOURCE" "$DEST"
8068
ls -la "$DEST"
81-
ls -la "$SOURCE"
8269
env:
8370
SOURCE: $(REPO_ROOT)/${{ job_data.templateContext.obDockerfile }}
8471
DEST: $(OUT_DIR)/Dockerfile
@@ -127,7 +114,6 @@ jobs:
127114
arch: $(ARCH)
128115
os: $(OS)
129116
name: $(name)
130-
dockerfile_path: ${{ job_data.templateContext.pkgArtifact }}
131117
build_tag: $(imageTag)
132118
extra_args: $(extraArgs) --build-arg ARTIFACT_DIR="${{ job_data.templateContext.pkgArtifact }}"
133119
archive_file: $(archiveName)-$(OS)-$(ARCH)-$(archiveVersion)

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#!/bin/bash
2-
set -nex
3-
4-
pwd
5-
ls -la
2+
set -eux
63

74
export GOOS=$OS
85
export GOARCH=$ARCH

.pipelines/build/scripts/cni.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
2-
set -nex
3-
pwd
4-
ls -la
2+
set -eux
53

64
mkdir -p "$OUT_DIR"/files
75
mkdir -p "$OUT_DIR"/bin

.pipelines/build/scripts/cns.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -nex
2+
set -eux
33

44
export GOOS=$OS
55
export GOARCH=$ARCH

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -nex
2+
set -eux
33

44
export GOOS=$OS
55
export GOARCH=$ARCH

.pipelines/build/scripts/npm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -nex
2+
set -eux
33

44
export GOOS=$OS
55
export GOARCH=$ARCH

0 commit comments

Comments
 (0)