Merge develop into staging, 2024 Feb 06 edition #1298
Merged
Conversation
This file contains 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
update_cached_concordances: Clean up --directory flag logic
and reset change I had made to make it run locally
Previously, the postgres configuration file was added to the /var/lib/postgresql/data directory which was overwritten by the already-existing named data volume. When initializing a database, the placement of the configuration file in /var/lib/postgresql/data caused an error that the "PGDATA was not empty." This commit fixes this issue by placing the configuration file in a different location (/etc/postgresql) and then running the Dockerfile entrypoint with an argument showing the location of the config file.
and also remove unnecessary line about fixtures
and add cantusdb.conf to .gitignore
explaining 3000:3000 port mapping
Merge jacobdgm's develop into CantusDB's develop
|
The staging server has been updated to run this code. All tests are passing, and everything seems to be working as expected. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When these changes are deployed on the staging server, it should mean:
update_cached_concordancescron job will be fixedAlso, we can test the updated deployment procedure (which will be rewritten to use Ansible soon, but anyways).