Skip to content

chore(cdi): restore patching after go mod vendor #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diafour merged 1 commit into from
May 19, 2025
Merged

chore(cdi): restore patching after go mod vendor #1062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions images/cdi-artifact/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,9 @@ shell:
git config --global --add advice.detachedHead false
git clone --depth 1 --branch v{{ $version }} $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} /containerized-data-importer

- |
cd /containerized-data-importer
for p in /patches/*.patch ; do
echo -n "Apply ${p} ... "
git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1)
done

- |
echo Download Go modules.
cd /containerized-data-importer
go mod download

echo Update modules to mitigate CVEs...
Expand All @@ -61,6 +55,15 @@ shell:
go mod tidy
go mod vendor

- |
# IMPORTANT!
# Apply patches after go mod vendor, as there are patches on modules in vendor directory.
cd /containerized-data-importer
for p in /patches/*.patch ; do
echo -n "Apply ${p} ... "
git apply --ignore-space-change --ignore-whitespace ${p} && echo OK || (echo FAIL ; exit 1)
done

setup:
- mkdir /cdi-binaries
- cd /containerized-data-importer
Expand Down
Loading