Merged
Conversation
cabarnes
requested changes
Aug 1, 2019
compose/django/entrypoint.sh
Outdated
| @@ -6,7 +6,6 @@ cmd="$@" | |||
| # Since docker-compose relies heavily on environment variables itself for configuration, we'd have to define multiple | |||
| # environment variables just to support cookiecutter out of the box. That makes no sense, so this little entrypoint | |||
| # does all this for us. | |||
Member
There was a problem hiding this comment.
Should probably remove this comment as well since what it is referring to is gone
Collaborator
Author
There was a problem hiding this comment.
Good catch! Fixing.
| ASGI_APPLICATION = 'config.asgi.application' | ||
|
|
||
| redis_url = urlparse(env('REDIS_URL', default='redis://127.0.0.1:6379')) | ||
| redis_url = urlparse(env('REDIS_URL', default='redis://redis:6379')) |
Member
There was a problem hiding this comment.
This default also exists in production.py. Do you want to change it there as well?
cabarnes
approved these changes
Aug 1, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
We had already set up config/settings/common.py to read the Redis URL from the environment, but it was being overwritten in entrypoint.sh. This gets rid of the overwriting export in entrypoint.sh.
I created an ElastiCache Redis instance and ssh'd into our beta EC2 to test this change.
We can leave redis in the docker-compose for now so that the alpha environment can use on-instance redis to save money.
Unrelated: I also commented the ECR deploy until we're ready to resume work on the ECS cluster.