Skip to content

Commit

Permalink
Merge pull request #2 from reasonerjt/bump-up-trivy-v-56-1
Browse files Browse the repository at this point in the history
bump up to trivy v0.56.1
  • Loading branch information
wy65701436 authored Oct 9, 2024
2 parents f5b21e0 + d5d9c5b commit b051a07
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# That's the only place where you're supposed to specify version of Trivy.
ARG TRIVY_VERSION=0.54.1
ARG TRIVY_VERSION=0.56.1

FROM aquasec/trivy:${TRIVY_VERSION}

Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# That's the only place where you're supposed to specify version of Trivy.
ARG TRIVY_VERSION=0.46.0
ARG TRIVY_VERSION=0.56.1
ARG SKAFFOLD_GO_GCFLAGS

FROM golang:1.21-alpine AS builder
FROM golang:1.22 AS builder

WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy

Expand Down Expand Up @@ -30,4 +30,6 @@ COPY --from=builder /go/src/github.com/aquasecurity/harbor-scanner-trivy/scanner

ENV TRIVY_VERSION=${TRIVY_VERSION}

USER scanner

ENTRYPOINT ["/home/scanner/bin/scanner-trivy"]
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
github.com/imdario/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
Expand Down
2 changes: 1 addition & 1 deletion test/component/component_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
trivyScanner = harbor.Scanner{
Name: "Trivy",
Vendor: "Aqua Security",
Version: "0.54.1",
Version: "0.56.1",
}
)

Expand Down

0 comments on commit b051a07

Please sign in to comment.