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

Jump to bottom

🤖 Revert the trivy DB changes #2889

Merged
merged 1 commit into from
Oct 1, 2024
Merged

🤖 Revert the trivy DB changes #2889

Show file tree
Hide file tree
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
21 changes: 0 additions & 21 deletions .github/workflows/release-arm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,6 @@ jobs:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Cache trivy DB
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build 🔧
run: |
earthly -P +all-arm \
Expand Down Expand Up @@ -366,13 +359,6 @@ jobs:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Cache trivy DB
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build 🔧
run: |
earthly -P +all-arm \
Expand Down Expand Up @@ -487,13 +473,6 @@ jobs:
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
- name: Login to Quay Registry
run: echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USERNAME }} --password-stdin quay.io
- name: Cache trivy DB
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build iso 🔧
run: |
INIT=$([[ "${{ matrix.flavor }}" == "alpine" ]] && echo "openrc" || echo "systemd")
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,6 @@ jobs:
with:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Cache trivy DB
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build 🔧
run: |
earthly +all \
Expand Down Expand Up @@ -414,13 +407,6 @@ jobs:
packages: utils/earthly
- name: Login to Quay Registry
run: echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USERNAME }} --password-stdin quay.io
- name: Cache trivy DB
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build 🔧
run: |
earthly +all \
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/reusable-build-flavor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,6 @@ jobs:
with:
repository: quay.io/kairos/packages
packages: system/kairos-agent
- name: Cache trivy DB
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build master 🔧
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: |
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/reusable-build-provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,6 @@ jobs:
with:
repository: quay.io/kairos/packages
packages: system/kairos-agent
- name: Cache trivy DB
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: nick-fields/retry@v3
with:
max_attempts: 3
retry_on: error
timeout_minutes: 5
command: earthly +trivy
- name: Build master 🔧
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
run: |
Expand Down
3 changes: 0 additions & 3 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,7 @@
trivy:
ARG TRIVY_VERSION
FROM aquasec/trivy:$TRIVY_VERSION
RUN /usr/local/bin/trivy fs --download-db-only
SAVE ARTIFACT /contrib contrib
SAVE ARTIFACT /root/.cache cache
SAVE ARTIFACT /usr/local/bin/trivy /trivy

trivy-scan:
Expand All @@ -783,10 +781,9 @@

COPY +trivy/trivy /trivy
COPY +trivy/contrib /contrib
COPY +trivy/cache /root/.cache

WORKDIR /build
RUN /trivy filesystem --skip-dirs /tmp --timeout 30m --format sarif -o report.sarif --no-progress /

Check failure on line 786 in Earthfile

View workflow job for this annotation

GitHub Actions / opensuse / build

Error 

The command RUN /trivy filesystem --skip-dirs /tmp --timeout 30m --format sarif -o report.sarif --no-progress / did not complete successfully. Exit code 1
RUN /trivy filesystem --skip-dirs /tmp --timeout 30m --format template --template "@/contrib/html.tpl" -o report.html --no-progress /
RUN /trivy filesystem --skip-dirs /tmp --timeout 30m -f json -o results.json --no-progress /
SAVE ARTIFACT /build/report.sarif report.sarif AS LOCAL build/${ISO_NAME}-trivy.sarif
Expand Down
Loading