Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow dnsmasq service to be disabled #462

Merged
merged 4 commits into from
Jan 17, 2023

Conversation

davidhiendl
Copy link
Contributor

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/.env with the key WARDEN_DNSMASQ_ENABLE which allows disabling dnsmasq by adding WARDEN_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.

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is useless message

Suggested change
echo "adding docker-compose.dnsmasq.yml"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Echo statement removed. Sorry for taking so long, this somehow slipped my mind.

@davidalger davidalger added the enhancement New feature or request label Feb 21, 2022
@davidalger davidalger self-assigned this Feb 21, 2022
@davidhiendl
Copy link
Contributor Author

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?

Copy link

@Den4ik Den4ik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @davidhiendl
Thanks for this PR. Please look at my comment

commands/svc.cmd Show resolved Hide resolved
@davidhiendl
Copy link
Contributor Author

@Den4ik How can I re-run the tests? I believe this was a temporary failure.

@navarr navarr merged commit b6a98ca into wardenenv:develop Jan 17, 2023
@navarr navarr added this to the Warden 1.0.0 milestone Jan 17, 2023
@navarr navarr linked an issue Jan 17, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Option to disable dnsmasq
5 participants