chore: update to go 1.21 and trivy 0.48.3 #941
Conversation
sozercan
changed the title
|
we might need to change this value too since it needs TRIVY_BINARY_TAG: |
sozercan
force-pushed
the
chore-go-121
branch
from
b339eeb to
327f57d
Compare
|
one more thing, we should remove trivyVersion from the trivy.go logs (line 69) since we aren't passing it through the linker anymore |
|
@ashnamehrotra I didn't realized we had that. That seems valuable. Reverted some of the changes and created |
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
sozercan
force-pushed
the
chore-go-121
branch
from
3c63e94 to
141ae91
Compare
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
|
keeping trivy arg in dockerfile for now. if dependabot updates this, then makefile (version is used in ldflags) and dockerfile will be out of sync |
Makefile
Outdated
| @@ -228,7 +226,6 @@ docker-build-trivy-scanner: ## Build docker image for trivy-scanner image. | |||
| docker buildx build \ | |||
| $(_CACHE_FROM) $(_CACHE_TO) \ | |||
| $(_ATTESTATIONS) \ | |||
| --build-arg TRIVY_BINARY_IMG="$(TRIVY_BINARY_IMG)" \ | |||
There was a problem hiding this comment.
Why are we removing this?
There was a problem hiding this comment.
Reverted this change. I was a bit confused since we define in both Makefile and Dockerfile, but I see that Dockerfile gets overwritten by this (added a comment in Dockerfile). It would be good to have a single source of truth in the future.
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
sozercan
changed the title
Signed-off-by: Sertac Ozercan <sozercan@gmail.com> Signed-off-by: ashnamehrotra <ashnamehrotra@gmail.com>
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, using
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when the PR gets merged):Fixes #
Special notes for your reviewer: