From eefaf6aaf8ad03a71be00340fcf4f5323bce2b74 Mon Sep 17 00:00:00 2001
From: Bingjie Liu <bingjie.liu@digital.justice.gov.uk>
Date: Tue, 9 Apr 2024 11:22:03 +0100
Subject: [PATCH 1/3] Add trivy image scan to security job
---
.circleci/config.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c19cdf44a..926c622b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -284,6 +284,10 @@ workflows:
context:
- veracode-credentials
- hmpps-common-vars
+ - hmpps/trivy_latest_scan:
+ slack_channel: << pipeline.parameters.alerts-slack-channel >>
+ context:
+ - hmpps-common-vars
security-weekly:
triggers:
- schedule:
From f84f9b76f821d1decc51550c18952ff1eb58962c Mon Sep 17 00:00:00 2001
From: Bingjie Liu <bingjie.liu@digital.justice.gov.uk>
Date: Tue, 9 Apr 2024 11:23:39 +0100
Subject: [PATCH 2/3] Test
---
.circleci/config.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 926c622b3..50cbb6629 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,6 +166,10 @@ workflows:
<<: *slack-fail-post-step
name: lint-helm-charts
env: dev
+ - hmpps/trivy_latest_scan:
+ slack_channel: << pipeline.parameters.alerts-slack-channel >>
+ context:
+ - hmpps-common-vars
- create-and-push-image-to-ecr:
<<: *slack-fail-post-step
From 968824a390aa1ab2da47a2aa63af3f2689a3e95b Mon Sep 17 00:00:00 2001
From: Bingjie Liu <bingjie.liu@digital.justice.gov.uk>
Date: Tue, 9 Apr 2024 11:31:59 +0100
Subject: [PATCH 3/3] Add build docker to deploy docker image to quay.io
---
.circleci/config.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 50cbb6629..55fd6e815 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,10 +166,12 @@ workflows:
<<: *slack-fail-post-step
name: lint-helm-charts
env: dev
- - hmpps/trivy_latest_scan:
- slack_channel: << pipeline.parameters.alerts-slack-channel >>
- context:
- - hmpps-common-vars
+ - hmpps/build_multiplatform_docker:
+ name: build_docker
+ filters:
+ branches:
+ only:
+ - main
- create-and-push-image-to-ecr:
<<: *slack-fail-post-step