Update data loading to new format and Dockerfile fixes #53
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.
This PR makes several updates and fixes to the Dockerfiles:
requirements.txt
.setup-and-load-solr.sh
to clarify its purpose. This required changing the GitHub test, which uses this file to setup and load a Solr instance for testing, and adding it to./data-loading /Dockerfile
.data-loading/Makefile
to support synonym files, which no longer need to be converted into JSON files.csv2json.py
, which is no longer needed, as well as all references to these files.nameresolution
:master
branch of the GitHub repo. This can cause a problem for using GitHub to publish Docker versions, since the tag might not be at the same place as themaster
branch. This PR modifies the Dockerfile to use the source code in the same directory as the Dockerfile. This should fix NameRes 1.2.0 reports its version as 1.1.0 #37.