fix: path to Dockerfile for docker scan action (#160)

Add the missing `./images` path prefix.
cds-snc · Dec 12, 2022 · be90e63 · be90e63
1 parent 0332cf2
commit be90e63
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
@@ -86,7 +86,7 @@ jobs:
         uses: cds-snc/security-tools/.github/actions/docker-scan@f0d609b2a8f51dbb4b1760b02a35fb1aadbae7f1 # v1.1.6
         with:
           docker_image: ${{ env.REGISTRY }}/${{ matrix.image }}
-          dockerfile_path: ${{ matrix.image }}/Dockerfile
+          dockerfile_path: ./images/${{ matrix.image }}/Dockerfile
           sbom_name: ${{ matrix.image }}
           token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/ci_build_containers.yml b/.github/workflows/ci_build_containers.yml
@@ -79,7 +79,7 @@ jobs:
         uses: cds-snc/security-tools/.github/actions/docker-scan@f0d609b2a8f51dbb4b1760b02a35fb1aadbae7f1 # v1.1.6
         with:
           docker_image: ${{ env.REGISTRY }}/${{ matrix.image }}
-          dockerfile_path: ${{ matrix.image }}/Dockerfile
+          dockerfile_path: ./images/${{ matrix.image }}/Dockerfile
           sbom_name: ${{ matrix.image }}
           token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/images/cloud_asset_inventory/cartography/Dockerfile b/images/cloud_asset_inventory/cartography/Dockerfile
@@ -18,4 +18,4 @@ ENV PATH="/home/python/venv/bin:${PATH}" \
 COPY --chown=python:python requirements.txt /home/python/cartography/requirements.txt
 RUN /home/python/venv/bin/pip install --no-cache-dir --requirement /home/python/cartography/requirements.txt
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/images/cloud_asset_inventory/sentinel_neo4j_forwarder/Dockerfile b/images/cloud_asset_inventory/sentinel_neo4j_forwarder/Dockerfile
@@ -25,4 +25,4 @@ COPY --from=public.ecr.aws/cds-snc/aws-sentinel-connector:c1f02b3f747b80fc18ed10
 RUN chown -R app:app /app/
 USER app
 
-CMD ["python3", "/app/neo4j_to_sentinel.py"]
+CMD ["python3", "/app/neo4j_to_sentinel.py"]
diff --git a/images/csp_violation_report_service/app/Dockerfile b/images/csp_violation_report_service/app/Dockerfile
@@ -33,4 +33,4 @@ RUN chmod 755 /app/entry.sh
 
 EXPOSE 8000
 
-ENTRYPOINT [ "/app/entry.sh" ]
+ENTRYPOINT [ "/app/entry.sh" ]
diff --git a/images/csp_violation_report_service/purge_stale_reports/Dockerfile b/images/csp_violation_report_service/purge_stale_reports/Dockerfile
@@ -31,4 +31,4 @@ COPY bin/entry.sh /app/entry.sh
 RUN chmod 755 /app/entry.sh
 
 ENTRYPOINT [ "/app/entry.sh" ]
-CMD [ "lambda.handler" ]
+CMD [ "lambda.handler" ]