Skip to content

Commit a033b19

Browse files
authored
Update ci.yaml
1 parent 7a8adbe commit a033b19

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/ci.yaml

+15-6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ jobs:
5454
# Push the Docker image
5555
docker push $REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
5656

57+
# Add latest tag
58+
docker tag $REGISTRY/$REPOSITORY:$IMAGE_TAG $REGISTRY/$REPOSITORY:latest
59+
60+
# push latest Docker Image
61+
docker push $REGISTRY/$REPOSITORY:latest
5762

5863
security:
5964
runs-on: ubuntu-latest
@@ -93,9 +98,11 @@ jobs:
9398
AWS_REGION: ${{ secrets.AWS_REGION }}
9499
IMAGE_TAG: 3.0.1
95100
ECR_REPOSITORY: mdaca/ohdsi/webapi
101+
96102
run: |
97-
trivy image --exit-code 1 --severity HIGH,CRITICAL $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$ECR_REPOSITORY:$IMAGE_TAG
98-
continue-on-error: true
103+
trivy image --severity HIGH,CRITICAL $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$ECR_REPOSITORY:$IMAGE_TAG
104+
trivy image --format json $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$ECR_REPOSITORY:$IMAGE_TAG > OHDSI-Webapi.json
105+
jq -r '.Results[] | select(.Vulnerabilities != null) | .Vulnerabilities[] | [.SeveritySource, .VulnerabilityID, .PkgName, .PkgPath, .InstalledVersion, .FixedVersion, .Status, .Severity] | @csv' OHDSI-Webapi.json > OHDSI-Webapi-Trivy.csv
99106
- name: Install Syft
100107
run: |
101108
curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sudo sh -s -- -b /usr/local/bin
@@ -110,8 +117,10 @@ jobs:
110117
syft $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$ECR_REPOSITORY:$IMAGE_TAG
111118
syft $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$ECR_REPOSITORY:$IMAGE_TAG > OHDSI-WEBAPI-sbom.tf
112119

113-
- name: Upload SBOM
114-
uses: actions/upload-artifact@v3
120+
- name: Upload Reports
121+
uses: actions/upload-artifact@v4
115122
with:
116-
name: sbom
117-
path: OHDSI-WEBAPI-sbom.tf
123+
name: trivy-and-sbom-reports
124+
path: |
125+
OHDSI-Webapi.csv
126+
OHDSI-Webapi-sbom.tf

0 commit comments

Comments
 (0)