Skip to content

Commit

Permalink
chore: fixup public ci build
Browse files Browse the repository at this point in the history
Signed-off-by: Maryam Tahhan <[email protected]>
  • Loading branch information
maryamtahhan committed Jan 15, 2025
1 parent 5c2d7f9 commit 9e9ccac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/public-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ jobs:
run: make image

- name: Generate .tar image
run: docker save -o vul-image.tar afxdp-device-plugin:latest

run: make generate-tar-image

- name: Run Trivy on tarballed image
uses: aquasecurity/trivy-action@master
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,13 @@ buildcni: buildc

build: builddp buildcni

fixup:
##@ Workflow targets.
fixup: ## Fixup for ubuntu
@sed -i "s/LDFLAGS: -L. -lxdp -lbpf -lelf -lz/LDFLAGS: -L. -lxdp -lbpf -lelf -lz -lzstd/g" internal/bpf/bpfWrapper.go

generate-tar-image: ## Fixup for Trivy
$(CTR_CMD) save -o vul-image.tar afxdp-device-plugin:latest

##@ Container build.
image-builder-check:
@if [ -z '$(CTR_CMD)' ] ; then echo '!! ERROR: containerized builds require podman||docker CLI, none found $$PATH' >&2 && exit 1; fi
Expand Down

0 comments on commit 9e9ccac

Please sign in to comment.