Dockerise the app #17
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
This will allow us to run postgres in a different container, using `docker-compose`.
|
Yay Docker! In general I'd prefer aa33bc0 as a separate PR, but doesn't matter this time. All v odd - odd that it passes for me even though the filepath is wrong, and odd that |
Also includes support for running a dev environment in docker, although this could be improved (specifically, by maintaining the user's uid rather than dropping them to root)
|
I've squashed the many commits that made up the docker-specific part of this PR into one commit to make a tidy commit history. I've moved the failing tests to a separate branch, for which I'll make a PR shortly. This PR is ready for a final review and merge. The Travis tests are expected to fail as I've removed the fixes to the aforementioned tests. |
|
Fixes #18 |
|
Hooray! |
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.
The purpose of this PR is to support running the tests in a docker container, as a workaround for problems we had getting the software to build in the Travis environment.
Theoretically this should allow us to run tests faster, and longer term, run a staging server using the same principles.
The PR also includes fixes to tests to get the test suite to pass.