Skip to content

Commit dd5444d

Browse files
committed
Switch to Trivy action for image scanning
1 parent 880fc9d commit dd5444d

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,14 @@ jobs:
186186
with:
187187
name: docker-image-${{ matrix.image }}
188188
path: ./docker-image
189-
- run: docker load --input ./docker-image/image.tar
190-
if: contains(matrix.image, 'alpine')
191-
- run: make ci-scan-vulnerability
189+
- name: Run Trivy vulnerability scanner in tarball mode
192190
if: contains(matrix.image, 'alpine')
191+
uses: aquasecurity/trivy-action@0.28.0
192+
with:
193+
input: ./docker-image/image.tar
194+
format: 'github'
195+
exit-code: '1'
196+
hide-progress: true
193197
test:
194198
name: Testing "${{ matrix.image }}"
195199
needs:

test-nts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ docker run --rm -t \
5858
renatomefi/docker-testinfra:5 \
5959
-m "$TEST_SUITE" --junitxml="/results/php-nts-$DOCKER_TAG.xml" \
6060
--disable-pytest-warnings \
61-
--verbose --hosts="docker://$DOCKER_CONTAINER"
61+
--verbose --hosts="docker://$DOCKER_CONTAINER"

test-zts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ docker run --rm -t \
5858
renatomefi/docker-testinfra:5 \
5959
-m "$TEST_SUITE" --junitxml="/results/php-zts-$DOCKER_TAG.xml" \
6060
--disable-pytest-warnings \
61-
--verbose --hosts="docker://$DOCKER_CONTAINER"
61+
--verbose --hosts="docker://$DOCKER_CONTAINER"

0 commit comments

Comments
 (0)