Skip to content
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

Update Trivy to 0.48.1 #291

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Update Trivy to 0.48.1 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56f5b8c
Update Trivy to 0.48.1
MartiUK Dec 20, 2023
1fdaee6
update tests
simar7 Jan 2, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "build"
on: [push, pull_request]
env:
TRIVY_VERSION: 0.48.0
TRIVY_VERSION: 0.48.1
BATS_LIB_PATH: '/usr/lib/'
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/aquasecurity/trivy:0.48.0
FROM ghcr.io/aquasecurity/trivy:0.48.1
COPY entrypoint.sh /
RUN apk --no-cache add bash curl npm
RUN chmod +x /entrypoint.sh
Expand Down
4 changes: 2 additions & 2 deletions test/data/config-sarif.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
}
}
],
"version": "0.48.0"
"version": "0.48.1"
}
},
"results": [
Expand Down Expand Up @@ -612,7 +612,7 @@
"columnKind": "utf16CodeUnits",
"originalUriBaseIds": {
"ROOTPATH": {
"uri": "file:///Users/simarpreetsingh/repos/trivy-action/"
"uri": "file:///home/runner/work/trivy-action/trivy-action/"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/data/config.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SchemaVersion": 2,
"CreatedAt": "2023-12-08T11:02:54.295987-07:00",
"CreatedAt": "2024-01-02T23:40:12.036390742Z",
"ArtifactName": ".",
"ArtifactType": "filesystem",
"Metadata": {
Expand Down
2 changes: 1 addition & 1 deletion test/data/fs-scheck.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SchemaVersion": 2,
"CreatedAt": "2023-12-08T11:02:56.571535-07:00",
"CreatedAt": "2024-01-02T23:40:15.166517221Z",
"ArtifactName": ".",
"ArtifactType": "filesystem",
"Metadata": {
Expand Down
2 changes: 1 addition & 1 deletion test/data/repo.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SchemaVersion": 2,
"CreatedAt": "2023-12-08T11:02:50.045151-07:00",
"CreatedAt": "2024-01-02T23:40:04.647712097Z",
"ArtifactName": "https://github.com/krol3/demo-trivy/",
"ArtifactType": "repository",
"Metadata": {
Expand Down
2 changes: 1 addition & 1 deletion test/data/tfvars.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SchemaVersion": 2,
"CreatedAt": "2023-12-08T11:03:02.76948-07:00",
"CreatedAt": "2024-01-02T16:27:32.841193-07:00",
"ArtifactName": "test/data",
"ArtifactType": "filesystem",
"Metadata": {
Expand Down
6 changes: 3 additions & 3 deletions test/data/yamlconfig.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SchemaVersion": 2,
"CreatedAt": "2023-12-08T11:03:01.877209-07:00",
"CreatedAt": "2024-01-02T23:40:21.039454971Z",
"ArtifactName": "alpine:3.10",
"ArtifactType": "container_image",
"Metadata": {
Expand Down Expand Up @@ -106,8 +106,8 @@
"https://nvd.nist.gov/vuln/detail/CVE-2021-36159",
"https://www.cve.org/CVERecord?id=CVE-2021-36159"
],
"PublishedDate": "2021-08-03T14:15:00Z",
"LastModifiedDate": "2023-11-07T03:36:00Z"
"PublishedDate": "2021-08-03T14:15:08.233Z",
"LastModifiedDate": "2023-11-07T03:36:43.337Z"
}
]
}
Expand Down
Loading