Skip to content

disable CoreDNS in client mode or if port 53 is in use #71

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 6, 2020
Merged

disable CoreDNS in client mode or if port 53 is in use #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9278f82
cont-init.d: Get the ip automatically silent
MiguelNdeCarvalho Oct 1, 2020
1a90c1a
disable CoreDNS if host networking is detected
aptalca Oct 6, 2020
a64e45f
Merge pull request #69 from MiguelNdeCarvalho/master
aptalca Oct 6, 2020
b3703f2
disable coredns in client mode or if 53 is in use
aptalca Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN \
jq \
libc6 \
libelf-dev \
net-tools \
openresolv \
perl \
pkg-config \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN \
jq \
libc6 \
libelf-dev \
net-tools \
openresolv \
perl \
pkg-config \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN \
jq \
libc6 \
libelf-dev \
net-tools \
openresolv \
perl \
pkg-config \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **06.10.20:** - Disable CoreDNS in client mode, or if port 53 is already in use in server mode.
* **04.10.20:** - Allow to specify a list of names as PEERS and add ALLOWEDIPS environment variable. Also, add peer name/id to each one of the peer sections in wg0.conf. Important: Existing users need to delete `/config/templates/peer.conf` and restart
* **27.09.20:** - Cleaning service binding example to have accurate PreDown script.
* **06.08.20:** - Replace resolvconf with openresolv due to dns issues when a client based on this image is connected to a server also based on this image. Add IPv6 info to readme. Display kernel version in logs.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ app_setup_block: |

# changelog
changelogs:
- { date: "06.10.20:", desc: "Disable CoreDNS in client mode, or if port 53 is already in use in server mode." }
- { date: "04.10.20:", desc: "Allow to specify a list of names as PEERS and add ALLOWEDIPS environment variable. Also, add peer name/id to each one of the peer sections in wg0.conf. Important: Existing users need to delete `/config/templates/peer.conf` and restart" }
- { date: "27.09.20:", desc: "Cleaning service binding example to have accurate PreDown script." }
- { date: "06.08.20:", desc: "Replace resolvconf with openresolv due to dns issues when a client based on this image is connected to a server also based on this image. Add IPv6 info to readme. Display kernel version in logs." }
Expand Down
6 changes: 4 additions & 2 deletions root/etc/cont-init.d/30-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ if [ -n "$PEERS" ]; then
fi
PEERS_COUNT=$(echo "${#PEERS_ARRAY[@]}")
if [ -z "$SERVERURL" ] || [ "$SERVERURL" = "auto" ]; then
SERVERURL=$(curl icanhazip.com)
SERVERURL=$(curl -s icanhazip.com)
echo "**** SERVERURL var is either not set or is set to \"auto\", setting external IP to auto detected value of $SERVERURL ****"
else
echo "**** External server address is set to $SERVERURL ****"
Expand Down Expand Up @@ -266,11 +266,13 @@ if [ -n "$PEERS" ]; then
fi
fi
else
echo "**** Client mode selected."
echo "**** Client mode selected. ****"
if [ ! -f /config/wg0.conf ]; then
echo "**** No client conf found. Provide your own client conf as \"/config/wg0.conf\" and restart the container. ****"
sleep infinity
fi
echo "**** Disabling CoreDNS ****"
rm -rf /etc/services.d/coredns
fi

# set up CoreDNS
Expand Down
9 changes: 7 additions & 2 deletions root/etc/services.d/coredns/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@

cd /config/coredns

exec \
/app/coredns -dns.port=53
if netstat -apn | grep -q ":53 "; then
Copy link

@fermulator fermulator Oct 10, 2020

Choose a reason for hiding this comment

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

lgtm: 👍 - this addresses the use case of server mode & docker host networking if pihole is already hogging the port :)

echo "Another service is using port 53, disabling CoreDNS"
sleep infinity
else
exec \
/app/coredns -dns.port=53
fi