Skip to content
This repository has been archived by the owner on Jan 27, 2023. It is now read-only.

Update docker entrypoint to fail on error #1174

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

found-it
Copy link
Contributor

@found-it found-it commented Aug 17, 2021

What this PR does / why we need it:

Proposed enhancement

Use set inside the entrypoint so it hard fails whenever there are errors.

Which issue this PR fixes (optional, in fixes #<issue number>)(, fixes #<issue_number, ...) format, will close the issue when PR is merged: fixes #:

Special notes:

To test
mkdir -p /tmp/certs
openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/certs/anchore.key -out /tmp/certs/anchore.crt
# fill out all info with junk, fields don't matter for test

make build
docker run -v /tmp/certs/:/home/anchore/certs/ anchore-engine:dev cat /home/anchore/certs_override/python/cacert.pem

found-it and others added 7 commits August 17, 2021 13:16
Use the `python3 -m certifi` command which returns the path of the certifi cacert.pem file. This means the script doesn't need to be changed whenever the python version for the container is changed.

Signed-off-by: James Petersen <jpetersenames@gmail.com>
The previous fix to this file dynamically found the Python version, but assumed the rest of the path to the certificate.
This patch uses the `python3 -m certifi` command which returns the exact path of the certifi cacert.pem file.  This will
be resilient through Python version changes.

Co-Authored-By: James Petersen <jpetersenames@gmail.com>
Co-Authored-By: Vijay Pillai <vijay.pillai@anchore.com>

Signed-off-by: Ryan Brady <ryan.brady@anchore.com>
Use `set` to fail the script if there are any errors in the entrypoint

https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html

Signed-off-by: James Petersen <jpetersenames@gmail.com>
update with [SC2236](https://github.com/koalaman/shellcheck/wiki/SC2236) change to remove double negative.

Signed-off-by: James Petersen <jpetersenames@gmail.com>
Update docker entrypoint with exact cert path
Use `set` to fail the script if there are any errors in the entrypoint

https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html

Signed-off-by: James Petersen <jpetersenames@gmail.com>
…t/anchore-engine into update-docker-entrypoint-certifi
@found-it found-it changed the title Update docker entrypoint with certifi path and set Update docker entrypoint to fail on error Aug 17, 2021
@Vijay-P
Copy link
Contributor

Vijay-P commented Aug 24, 2021

@found-it pretty sure this partially conflicts with what's currently in master. I think we already have the certifi fix in. Can you rebase please?

Copy link
Contributor

@rbrady rbrady left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The options set here are a good common addition to our bash scripts. Thanks @found-it .

@zhill
Copy link
Member

zhill commented Sep 7, 2021

Can this be squash-merged to only have 1 commit instead of 7 since the changeset is fairly small?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants