Skip to content

Commit 14ca962

Browse files
committed
tag in right place
1 parent 61ae19f commit 14ca962

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
"name": "Ubuntu",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "foo",
76
"build": {
87
"dockerfile": "Dockerfile",
98
"context": "..",

.github/workflows/pull_request.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,6 @@ jobs:
8787
secrets:
8888
PUSH_IMAGE_ROLE: ${{ secrets.PUSH_IMAGE_ROLE }}
8989

90-
tag_latest_dev_container:
91-
needs: [quality_checks, get_issue_number_and_commit_id]
92-
uses: ./.github/workflows/tag_latest_dev_container.yml
93-
with:
94-
dev_container_ecr: dev-container-quality-checks
95-
dev_container_image_tag: PR-${{ needs.get_issue_number_and_commit_id.outputs.issue_number }}-${{ needs.get_issue_number_and_commit_id.outputs.sha_short }}
96-
version_tag_to_apply: FooBar
97-
secrets:
98-
PUSH_IMAGE_ROLE: ${{ secrets.PUSH_IMAGE_ROLE }}
9990
tag_release:
10091
needs: [quality_checks, get_asdf_version]
10192
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f80157cecce288dd175e61b477a1d2dbe9c88b99

.github/workflows/release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,12 @@ jobs:
6363
publish_package: false
6464
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
6565
secrets: inherit
66+
tag_latest_dev_container:
67+
needs: [quality_checks, get_commit_id, tag_release]
68+
uses: ./.github/workflows/tag_latest_dev_container.yml
69+
with:
70+
dev_container_ecr: dev-container-quality-checks
71+
dev_container_image_tag: release-${{ needs.get_commit_id.outputs.sha_short }}
72+
version_tag_to_apply: ${{ needs.tag_release.outputs.version_tag }}
73+
secrets:
74+
PUSH_IMAGE_ROLE: ${{ secrets.PUSH_IMAGE_ROLE }}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ A workflow to run the quality checks for EPS repositories. The main element of t
1212
- **Validate CloudFormation Templates** (*Conditional*): If CloudFormation, AWS SAM templates or CDK are present, runs `cfn-lint` (SAM and cloudformation only) and `cfn-guard` to validate templates against AWS best practices and security rules.
1313
- **CDK Synth** (*Conditional*): Runs `make cdk-synth` if packages/cdk folder exists
1414
- **Check Licenses**: Runs `make check-licenses`.
15-
- **Check Python Licenses** (*Conditional*): If the project uses Poetry, scans Python dependencies for incompatible licenses.
15+
-- **Build dev containers**: Builds dev containers (for x64 and arm64 architecture), pushes to ECR and checks vulnerability scan results
1616

1717
The secret scanning also has a dockerfile, which can be run against a repo in order to scan it manually (or as part of pre-commit hooks). This can be done like so:
1818
```bash
1919
docker build -f https://raw.githubusercontent.com/NHSDigital/eps-workflow-quality-checks/refs/tags/v3.0.0/dockerfiles/nhsd-git-secrets.dockerfile -t git-secrets .
2020
docker run -v /path/to/repo:/src git-secrets --scan-history .
2121
```
22+
Or it can be pulled from ECR
2223
For usage of the script, see the [source repo](https://github.com/NHSDigital/software-engineering-quality-framework/blob/main/tools/nhsd-git-secrets/git-secrets). Generally, you will either need `--scan -r .` or `--scan-history .`. The arguments default to `--scan -r .`, i.e. scanning the current state of the code.
2324

2425
In order to enable the pre-commit hook for secret scanning (to prevent developers from committing secrets in the first place), add the following to the `.devcontainer/devcontainer.json` file:

0 commit comments

Comments
 (0)