This repository was archived by the owner on Nov 30, 2025. It is now read-only.
Docker Compatibility & Automatic Git Dir Variable - #28
Open
Banner-Keith wants to merge 2 commits into
Open
Conversation
Banner-Keith
commented
Jan 26, 2021
Banner-Keith
commented
Jan 26, 2021
stevejenkins
approved these changes
Nov 21, 2023
stevejenkins
left a comment
Owner
There was a problem hiding this comment.
Thanks. This looks great. Sorry for the massive delay. I'm finally getting back into my nerdy projects. :)
Owner
|
Well phooey. Looks like it has a conflict with the head branch. |
This file contains hidden or 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
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 is a continuation of #18 by @IarwainBen-adar
I noticed that there had been no response there for 25 days, and there were some merge conflicts.
I pulled this down and created a branch to work from. This is the sum of my changes added to the changes that @IarwaiBen-adar had made.
I have tested it with Pi-Hole v5 running in docker.
I have a docker container running in UnRAID as the master, and a container on a Raspberrry Pi as a downstream pi-hole. Push and Pull is working great.
I also made it so that you don't have to set the personal_git_dir repo as it will be set automatically based on the location of the pihole-cloudsync script. It works regardless of where you are when you execute the script.
With this change you also don't need to change the pihole_dir or dnsmasq_dir paths if you are running in a container. It will look for those paths inside of the container and find the mapped volume outside of the container.
I am very open to feedback if you see anything that you don't like or anything that makes it more difficult for those not running a container. I don't have that setup to test, but I don't see anything in my changes that would have a negative impact on non-docker users.
The way that @IarwainBen-adar had this set up was to auto-detect if there is a pihole docker container. If we wanted we could have that be a flag that is passed, but I think this solution is fine since it is very unlikely that someone would have an active pihole container and a local install since they can't both be on port 53.