Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update data loading to new format and Dockerfile fixes #53

Merged
merged 12 commits into from
Jun 12, 2023

Conversation

gaurav
Copy link
Contributor

@gaurav gaurav commented Apr 27, 2023

This PR makes several updates and fixes to the Dockerfiles:

  • Fixed formatting issue in requirements.txt.
  • Added a .dockerignore that ignores some content that shouldn't be included in the Docker images.
  • Moved setup.sh into data-loading/ and renamed it to 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.
  • Increased disk space in Kubernetes to account for larger synonym files.
  • Updated data-loading/Makefile to support synonym files, which no longer need to be converted into JSON files.
  • Deleted csv2json.py, which is no longer needed, as well as all references to these files.
  • In the Dockerfile for nameresolution:
    • Added a home directory and added the local bin to the PATH so we can install Python packages there.
    • The Dockerfile currently takes its code from the 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 the master 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.

Base automatically changed from prototype to master June 8, 2023 19:04
@gaurav gaurav merged commit ff491ed into master Jun 12, 2023
1 check passed
@gaurav gaurav deleted the dockerfile-improvements branch June 12, 2023 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NameRes 1.2.0 reports its version as 1.1.0
2 participants