This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Refactor docker locations and README. #3253
Closed
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 addresses #3224
|
Hmm. Do I need a |
richvdh
reviewed
May 24, 2018
docker/README.md
Outdated
| ### Using docker-compose (easier) | ||
|
|
||
| This image is designed to run either with an automatically generated configuration | ||
| file or with a custom configuration that requires manual edition. |
docker/README.md
Outdated
| This image is designed to run either with an automatically generated configuration | ||
| file or with a custom configuration that requires manual edition. | ||
|
|
||
| An easy way to make use of this image is via docker-compose, see the (https://github.com/matrix-org/synapse/tree/develop/contrib/docker)[contrib] section of the synapse project for examples. |
There was a problem hiding this comment.
You can't use a comma to join independent clauses. s/,/./
|
Turns out that I'm not really sure why some things are excluded that way, and others via MANIFEST.in. I think I prefer the latter. I think you want |
|
@michaelkaye I believe this was superseded by #3644 - correct? |
|
this seems to be dead. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 addresses #3224 - we need to have the README in the same directory as the Dockerfile, but we currently have the main synapse readme in the root folder.
Moving the Dockerfile into the subdirectory will make it slightly harder (add
-f docker/Dockerfileto the build command) but will make the updating of the readme on docker hub much simpler.Also, by moving parts out of contrib that don't belong there, we can make it clearer which parts of the packaging we're supporting directly (and hopefully incorporate more contrib code, which depends on the image).