christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-14 06:58:21 +00:00
Code Issues Releases Activity

fix: forum connection to mongodb (again)

Browse Source 
Turns out, the authentication mechanism should only be defined if there
is an actual authentication. For now, because of the urgency, we
hardcode this auth_mech to ":scram". We'll add a way to override it if
necessary, in the future.
This commit is contained in:
Régis Behmo 2021-09-18 10:16:52 +02:00
parent 9263add948
commit bf5d2b80d8
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@ Note: Breaking changes between versions are indicated by "💥".
## Unreleased ## Unreleased
- [Bugfix] Fix (agin) forum starting issue: "NoMethodError: undefined method `encode' for nil:NilClass".
## v12.1.1 (2021-09-17) ## v12.1.1 (2021-09-17)
- [Bugfix] Fix forum starting issue: "NoMethodError: undefined method `encode' for nil:NilClass". - [Bugfix] Fix forum starting issue: "NoMethodError: undefined method `encode' for nil:NilClass".

2
tutor/templates/build/forum/Dockerfile
View File

@ -45,7 +45,7 @@ ENV NEW_RELIC_ENABLE false
ENV API_KEY forumapikey ENV API_KEY forumapikey
ENV SEARCH_SERVER "http://elasticsearch:9200" ENV SEARCH_SERVER "http://elasticsearch:9200"
ENV MONGODB_AUTH "" ENV MONGODB_AUTH ""
ENV MONGOID_AUTH_MECH ":scram" ENV MONGOID_AUTH_MECH ""
ENV MONGODB_HOST "mongodb" ENV MONGODB_HOST "mongodb"
ENV MONGODB_PORT "27017" ENV MONGODB_PORT "27017"
ENV MONGODB_DATABASE "cs_comments_service" ENV MONGODB_DATABASE "cs_comments_service"

6
tutor/templates/build/forum/bin/docker-entrypoint.sh
View File

@ -4,6 +4,12 @@ export MONGOHQ_URL="mongodb://$MONGODB_AUTH$MONGODB_HOST:$MONGODB_PORT/$MONGODB_
# the search server variable was renamed after the upgrade to elasticsearch 7 # the search server variable was renamed after the upgrade to elasticsearch 7
export SEARCH_SERVER_ES7="$SEARCH_SERVER" export SEARCH_SERVER_ES7="$SEARCH_SERVER"
# make sure that there is an actual authentication mechanism in place, if necessary
if [ -n "$MONGODB_AUTH" ]
then
export MONGOID_AUTH_MECH=":scram"
fi
echo "Waiting for mongodb/elasticsearch..." echo "Waiting for mongodb/elasticsearch..."
dockerize -wait tcp://$MONGODB_HOST:$MONGODB_PORT -wait $SEARCH_SERVER -wait-retry-interval 5s -timeout 600s dockerize -wait tcp://$MONGODB_HOST:$MONGODB_PORT -wait $SEARCH_SERVER -wait-retry-interval 5s -timeout 600s