Merge branch 'master' into issue-490

Conflicts:
	.github/workflows/build_aca_image.yml
This commit is contained in:
syncomp-dev1 2022-09-02 12:06:05 -04:00
commit ff906654c0

View File

@ -61,4 +61,4 @@ jobs:
with:
image_name: nsacyber/hirs/${{ inputs.imagename }}
github_token: ${{ secrets.GITHUB_TOKEN }}
dockerfile: "./.ci/docker/Dockerfile.acaimage"
dockerfile: "./.ci/docker/Dockerfile.acaimage"