Allow dnsmasq service to be disabled #462
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
ihor-sviziev
suggested changes
Dec 28, 2021
commands/svc.cmd
Outdated
| ## add dnsmasq docker-compose | ||
| WARDEN_DNSMASQ_ENABLE="${WARDEN_DNSMASQ_ENABLE:-1}" | ||
| if [[ "$WARDEN_DNSMASQ_ENABLE" == "1" ]]; then | ||
| echo "adding docker-compose.dnsmasq.yml" |
There was a problem hiding this comment.
I think this is useless message
Suggested change
| echo "adding docker-compose.dnsmasq.yml" |
There was a problem hiding this comment.
Echo statement removed. Sorry for taking so long, this somehow slipped my mind.
ihor-sviziev
approved these changes
Feb 8, 2022
|
I'm not exactly sure why these tests failed, my changes do not relate to them at all and the logs seem to point to a node-sass compiler issue. What can I do to fix this? |
Den4ik
suggested changes
Apr 20, 2022
There was a problem hiding this comment.
Hi @davidhiendl
Thanks for this PR. Please look at my comment
Den4ik
approved these changes
Apr 20, 2022
|
@Den4ik How can I re-run the tests? I believe this was a temporary failure. |
navarr
approved these changes
Jan 17, 2023
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.
This PR is a solution I've been using in response to my issue #388 "Option to disable dnsmasq".
When running a dedicated customized dnsmasq (or similar service) on host or outside the scope of warden it might be in conflict.
This PR adds a configuration flag via
$WARDEN_HOME_DIR/.envwith the keyWARDEN_DNSMASQ_ENABLEwhich allows disabling dnsmasq by addingWARDEN_DNSMASQ_ENABLE=0.The default behavior to start a dnsmasq service remains unchanged.
In addition I've added support for loading an additional docker-compose file from ``$WARDEN_HOME_DIR/docker-compose.yml` which is added if present. This allows for deploying a customized dnsmasq (or other services that multiple projects might consume) with easy access to warden docker network and variables.