Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: path to Dockerfile for docker scan action #160

Merged
merged 1 commit into from
Dec 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_build_containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion images/cloud_asset_inventory/cartography/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion images/csp_violation_report_service/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ RUN chmod 755 /app/entry.sh

EXPOSE 8000

ENTRYPOINT [ "/app/entry.sh" ]
ENTRYPOINT [ "/app/entry.sh" ]
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]