Skip to content

Commit 334ec8c

Browse files
authored
fix binary build (#266)
* try adding missing dependency to cross setup * maybe this way * another try * pin toolchain version * Revert "another try" This reverts commit 5a5948d. * update dependencies * update trivy config (#247) * update nix flake * add trivyignore config * use ignore config in CI pipelines * update cargo deny config
1 parent 48255eb commit 334ec8c

9 files changed

Lines changed: 164 additions & 130 deletions

File tree

.github/workflows/build-docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575

7676
- name: Scan image with Trivy
7777
uses: aquasecurity/trivy-action@0.33.1
78+
env:
79+
TRIVY_SHOW_SUPPRESSED: 1
80+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
7881
with:
7982
image-ref: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
8083
format: "table"

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ jobs:
3535

3636
- name: Scan code with Trivy
3737
uses: aquasecurity/trivy-action@0.33.1
38+
env:
39+
TRIVY_SHOW_SUPPRESSED: 1
40+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
3841
with:
39-
scan-type: 'fs'
40-
scan-ref: '.'
42+
scan-type: "fs"
43+
scan-ref: "."
4144
exit-code: "1"
4245
ignore-unfixed: true
4346
severity: "CRITICAL,HIGH,MEDIUM"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- name: Install Rust stable
100100
uses: actions-rs/toolchain@v1
101101
with:
102-
toolchain: stable
102+
toolchain: 1.89.0 # "stable" causes rust-lld: error on aarch64-linux
103103
target: ${{ matrix.target }}
104104
override: true
105105

.github/workflows/sbom.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,40 +34,52 @@ jobs:
3434

3535
- name: Create SBOM with Trivy
3636
uses: aquasecurity/trivy-action@0.33.1
37+
env:
38+
TRIVY_SHOW_SUPPRESSED: 1
39+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
3740
with:
38-
scan-type: 'fs'
39-
format: 'spdx-json'
41+
scan-type: "fs"
42+
format: "spdx-json"
4043
output: "defguard-gateway-${{ steps.vars.outputs.VERSION }}.sbom.json"
41-
scan-ref: '.'
44+
scan-ref: "."
4245
severity: "CRITICAL,HIGH,MEDIUM,LOW"
4346
scanners: "vuln"
4447

4548
- name: Create docker image SBOM with Trivy
4649
uses: aquasecurity/trivy-action@0.33.1
50+
env:
51+
TRIVY_SHOW_SUPPRESSED: 1
52+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
4753
with:
4854
image-ref: "ghcr.io/defguard/gateway:${{ steps.vars.outputs.VERSION }}"
49-
scan-type: 'image'
50-
format: 'spdx-json'
55+
scan-type: "image"
56+
format: "spdx-json"
5157
output: "defguard-gateway-${{ steps.vars.outputs.VERSION }}-docker.sbom.json"
5258
severity: "CRITICAL,HIGH,MEDIUM,LOW"
5359
scanners: "vuln"
5460

5561
- name: Create security advisory file with Trivy
5662
uses: aquasecurity/trivy-action@0.33.1
63+
env:
64+
TRIVY_SHOW_SUPPRESSED: 1
65+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
5766
with:
58-
scan-type: 'fs'
59-
format: 'json'
67+
scan-type: "fs"
68+
format: "json"
6069
output: "defguard-gateway-${{ steps.vars.outputs.VERSION }}.advisories.json"
61-
scan-ref: '.'
70+
scan-ref: "."
6271
severity: "CRITICAL,HIGH,MEDIUM,LOW"
6372
scanners: "vuln"
6473

6574
- name: Create docker image security advisory file with Trivy
6675
uses: aquasecurity/trivy-action@0.33.1
76+
env:
77+
TRIVY_SHOW_SUPPRESSED: 1
78+
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
6779
with:
6880
image-ref: "ghcr.io/defguard/gateway:${{ steps.vars.outputs.VERSION }}"
69-
scan-type: 'image'
70-
format: 'json'
81+
scan-type: "image"
82+
format: "json"
7183
output: "defguard-gateway-${{ steps.vars.outputs.VERSION }}-docker.advisories.json"
7284
severity: "CRITICAL,HIGH,MEDIUM,LOW"
7385
scanners: "vuln"

.trivyignore.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
vulnerabilities:
2+
- id: GHSA-585q-cm62-757j
3+
expired_at: 2026-02-12
4+
statement: "No fixed version available yet. The Mullvad team intends to fix it in the coming weeks: https://github.com/mullvad/mnl-rs/issues/15"

0 commit comments

Comments
 (0)