Skip to content

Commit

Permalink
Update config.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
rfaircloth-splunk committed Oct 7, 2019
1 parent ae0e0bb commit b59f103
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ version: 2.1

orbs:
snyk: snyk/snyk@0.0.8
clair-scanner: ovotech/clair-scanner@1.5.0

jobs:
build:
Expand Down Expand Up @@ -148,7 +149,7 @@ jobs:
when: always
- store_test_results:
path: test-results
test-scan_images:
test-scan-synk:
docker:
- image: 'circleci/buildpack-deps:stretch'
environment:
Expand All @@ -160,6 +161,25 @@ jobs:
- snyk/scan:
docker-image-name: $IMAGE_NAME:$CIRCLE_SHA1

test-scan-clair:
environment:
IMAGE_NAME: rfaircloth/scs
executor: clair_scanner/default
steps:
- clair_scanner/scan:
image: $IMAGE_NAME:$CIRCLE_SHA1
whitelist: clair-whitelist.yml
# - run:
# command: |
# mkdir -p /root/project/test-results
# pip install -r requirements.txt
# python clair_to_junit_parser.py "/clair-reports/$IMAGE_NAME:$CIRCLE_SHA1.json" --output test-results/results.xml
# when: on_fail
# - store_test_results:
# path: test-results/results.xml
# - store_artifacts:
# path: /clair-reports


publish-common:
machine:
Expand Down Expand Up @@ -264,7 +284,7 @@ workflows:
- test-unit:
requires:
- build
- test-scan_images:
- test-scan-synk:
requires:
- build
- publish-common:
Expand Down

0 comments on commit b59f103

Please sign in to comment.