Add Admin1 support, de-compose Docker#12
Merged
ahalterman merged 7 commits intomasterfrom Jul 29, 2016
Merged
Conversation
Closed
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
1 participant
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.
Unfortunately this PR has two major changes. Sorry.
docker-compose(closes Connection error #9). Instead of usingdocker-composeto connect Mordecai and the Elastic/Geonames service, Mordecai now uses a config file. If the config file has an entry, it uses that port/url. If the server section is commented out, it looks for a Docker container to be linked to Mordecai when Mordecai is started (see README).Smaller changes:
country_filteris coerced to a list before going to ES.Despite the number of changes, this PR is sort of a hotfix, as the current master branch does not work.