This repository has been archived by the owner on Jan 27, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 271
Update docker entrypoint to fail on error #1174
Open
found-it
wants to merge
7
commits into
anchore:master
Choose a base branch
from
found-it:update-docker-entrypoint-certifi
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update docker entrypoint to fail on error #1174
found-it
wants to merge
7
commits into
anchore:master
from
found-it:update-docker-entrypoint-certifi
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
changed the title
Update docker entrypoint with certifi path and set
Update docker entrypoint to fail on error
Aug 17, 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? |
rbrady
approved these changes
Aug 24, 2021
There was a problem hiding this 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 .
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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