-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Hof 405 #61
Open
DivineTaminangHO
wants to merge
9
commits into
master
Choose a base branch
from
HOF-405
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+36
−96
Open
Hof 405 #61
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4c81d03
Update .drone.yml
DivineTaminangHO 7f744ae
Update and rename cve-exceptions.txt to trivy-cve-exceptions.txt
DivineTaminangHO 216fd1c
Update .drone.yml
DivineTaminangHO 1e0bea8
Update .drone.yml
DivineTaminangHO ddd8532
Update .drone.yml
DivineTaminangHO 87b0010
Update .drone.yml
DivineTaminangHO f05b9ec
Update .drone.yml
DivineTaminangHO 74c1049
Update .drone.yml
DivineTaminangHO a99eeb7
Update .drone.yml
DivineTaminangHO File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,17 +3,17 @@ name: default | |
type: kubernetes | ||
steps: | ||
- name: install | ||
image: node:14 | ||
image: node:18 | ||
commands: | ||
- npm ci | ||
|
||
- name: test | ||
image: node:14 | ||
image: node:18 | ||
commands: | ||
- npm test | ||
|
||
- name: audit | ||
image: node:14 | ||
image: node:18 | ||
commands: | ||
- npm audit --audit-level=high --production | ||
|
||
|
@@ -24,14 +24,30 @@ steps: | |
- n=0; while [ "$n" -lt 60 ] && [ ! docker stats --no-stream ]; do n=$(( n + 1 )); sleep 1; done | ||
- docker build -t html-pdf-converter . | ||
|
||
- name: scan-image | ||
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:latest | ||
pull: always | ||
environment: | ||
IMAGE_NAME: html-pdf-converter | ||
WHITELIST_FILE: cve-exceptions.txt | ||
# - name: scan-image | ||
# image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:latest | ||
# pull: always | ||
# environment: | ||
# IMAGE_NAME: html-pdf-converter | ||
# WHITELIST_FILE: cve-exceptions.txt | ||
|
||
steps: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please Remove "Steps" |
||
- name: scan-image | ||
pull: Always | ||
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/trivy/client:latest | ||
resources: | ||
limits: | ||
cpu: 1000 | ||
memory: 1024Mi | ||
environment: | ||
IMAGE_NAME: html-pdf-converter | ||
when: | ||
event: | ||
- pull_request | ||
- push | ||
- tag | ||
|
||
- name: docker push | ||
- name: docker push | ||
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind | ||
environment: | ||
DOCKER_PASSWORD: | ||
|
@@ -43,12 +59,20 @@ steps: | |
when: | ||
event: tag | ||
|
||
# services: | ||
# - name: docker | ||
# image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind | ||
# - name: anchore-submission-server | ||
# image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:latest | ||
# pull: always | ||
# commands: | ||
# - /run.sh server | ||
|
||
services: | ||
- name: docker | ||
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/dind | ||
- name: anchore-submission-server | ||
image: 340268328991.dkr.ecr.eu-west-2.amazonaws.com/acp/anchore-submission:latest | ||
pull: always | ||
commands: | ||
- /run.sh server | ||
resources: | ||
limits: | ||
cpu: 1000 | ||
memory: 1024Mi | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Trivy Scan step should run after Docker push to Quay.
Also Image name has to be set to quay.io/ukhomeofficedigital/html-pdf-converter:$${DRONE_TAG}
Please follow ETA .drone.yml
We need these added
SEVERITY: MEDIUM,HIGH,CRITICAL
FAIL_ON_DETECTION: false
IGNORE_UNFIXED: true
and
ALLOW_CVE_LIST_FILE: trivy-cve-exceptions.txt
Also please check the conditions of Drone that executes the drone pipeline.