|
20 | 20 | steps:
|
21 | 21 | - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
|
22 | 22 |
|
23 |
| - # - name: Build the Docker image |
24 |
| - # run: make compose/rebuild |
25 |
| - # - name: Image List |
26 |
| - # run: docker image ls -a |
27 |
| - # - name: Lint in Docker image |
28 |
| - # run: make compose/lint |
29 |
| - # - name: Test in Docker image |
30 |
| - # run: make compose/test |
31 |
| - # - name: Run in Docker image |
32 |
| - # run: make compose/run |
33 |
| - |
34 | 23 | - name: Set up Docker Buildx
|
35 | 24 | uses: docker/setup-buildx-action@v3
|
36 | 25 |
|
@@ -116,7 +105,7 @@ jobs:
|
116 | 105 | docker load --input /tmp/${{ env.ARTIFACT_NAME }}_test.tar
|
117 | 106 | docker image ls -a
|
118 | 107 |
|
119 |
| - - name: Run lint |
| 108 | + - name: Run test |
120 | 109 | run: |
|
121 | 110 | docker run --rm ${{ env.IMAGE_NAME }}:test make test
|
122 | 111 |
|
@@ -173,15 +162,14 @@ jobs:
|
173 | 162 | uses: aquasecurity/[email protected]
|
174 | 163 | with:
|
175 | 164 | image-ref: ${{ env.IMAGE_NAME }}:${{ github.sha }}
|
176 |
| - format: 'table' |
| 165 | + format: 'sarif' |
| 166 | + output: 'trivy-results.sarif' |
177 | 167 | exit-code: '1'
|
178 | 168 | ignore-unfixed: true
|
179 | 169 | vuln-type: 'os,library'
|
180 | 170 | severity: 'CRITICAL,HIGH'
|
181 | 171 |
|
182 |
| - # yamllint disable rule:comments-indentation |
183 |
| - # - name: Upload Trivy scan results to GitHub Security tab |
184 |
| - # uses: github/codeql-action/upload-sarif@v2 |
185 |
| - # with: |
186 |
| - # sarif_file: 'trivy-results.sarif' |
187 |
| - # yamllint enable rule:comments-indentation |
| 172 | + - name: Upload Trivy scan results to GitHub Security tab |
| 173 | + uses: github/codeql-action/upload-sarif@v2 |
| 174 | + with: |
| 175 | + sarif_file: 'trivy-results.sarif' |
0 commit comments