failed to cherry pick PR 5183 from cyclinder, to branch release-v1.0 #5185
Description
commits 7677971 of cyclinder conflict when merging to branch release-v1.0, please manually cherry pick it by yourself.
PR #5183 , action https://github.com/spidernet-io/spiderpool/actions/runs/18002002724
Auto-merging images/spiderpool-agent/Dockerfile
CONFLICT (content): Merge conflict in images/spiderpool-agent/Dockerfile
error: could not apply 7677971af... Using jq to parse the default CNI for improved script robustness (#5183)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"