Fix docker development setup after switch to puma #8396
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
With diaspora#8392 the `single_process_mode` was removed, which means that development now also requires a redis.
When puma was introduced in diaspora#8392 the default listen configuration was set to only localhost, which makes sense for most development setups, but when run within docker, it needs to listen on all IPs so the port can be forwarded to be accessable outside of docker. Because the new default makes sense without docker, I overwrite the option with a environment variable only in the docker-setup. This also ensures that it always contains the right value needed for the docker-setup to work, no matter what was configured outside of docker.
As the docker-compose.yml contains variables, it can't just be used with docker-compose directly. So this manually use docker-compose commands with all the required environment variables set.
We download a static amd64 browser, so this would explode on arm64, for example.
denschub
approved these changes
Sep 19, 2022
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.
single_process_mode, which means it now requires a redis instance for development setups. This wasn't the case yet in our docker setup, so it failed to start because it didn't find redis. I added a redis container to our docker-compose setup.listenconfiguration for development to only listen on localhost. While this is a good default for normal development setups to not expose a port, it also broke our docker setup because the port now couldn't be forwarded outside of the docker container anymore. So I change this back to the old default when used with docker.docker-composecommand outside of thediaspora-devscript, so I'm able to run normaldocker-composecommands directly without needing to manually set the correct environment variable that are required by ourdocker-compose.yml.For the configurations for
redisandlisten, I overwrite the values set in thediaspora.tomlas environment variables in thedocker-compose.yml, as otherwise everybody would need to ensure that the configure the correct settings themselves in theirdiaspora.toml. That way it ensures that you can't break the docker-setup with a wrong setting, but can still set different settings in thediaspora.tomlwhen running without docker.