Fix docker entrypoint errors introduced by #715 #721
Merged
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
Issue: AAH-486
bmclaughlin
changed the title
|
This looks good to me, going to check out the fork and verify it works as expected. |
|
Works for me :) |
cutwater
requested changes
Apr 13, 2021
docker/entrypoint.sh
Outdated
| protocol="rediss://" | ||
| else | ||
| protocol="redis://" | ||
| fi | ||
|
|
||
| if [[ -z "$PULP_REDIS_PASSWORD" ]]; then | ||
| if [[ ${PULP_REDIS_PASSWORD:-nopassword} = "nopassword" ]]; then |
There was a problem hiding this comment.
Suggested change
| if [[ ${PULP_REDIS_PASSWORD:-nopassword} = "nopassword" ]]; then | |
| if [[ -z "${PULP_REDIS_PASSWORD:-}" ]]; then |
cutwater
requested changes
Apr 13, 2021
| # settings for RQ in pulpcore/rqconfig.py | ||
| p_redis_host="${PULP_REDIS_HOST:-localhost}" | ||
| p_redis_port="${PULP_REDIS_PORT:-6379}" | ||
| redis_connection_hack |
There was a problem hiding this comment.
you can move it below wait-for-tcp to avoid variable assignments
Issue: AAH-486
Issue: AAH-486
bmclaughlin
force-pushed
the
bug/fix-pulp-redis-ssl-breakage
branch
from
59d2218
to
03d45f8
Compare
cutwater
approved these changes
Apr 13, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue: AAH-486