From 093eb42b470cbe88a920565d2d4ebf063e3652ef Mon Sep 17 00:00:00 2001 From: Farid Musa Date: Mon, 1 Jan 2024 22:17:56 +0400 Subject: [PATCH] dns networks --- start.d/internal_dns.sh | 10 ++++++++-- stop.d/internal_dns.sh | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/start.d/internal_dns.sh b/start.d/internal_dns.sh index 30c8ffa..e01c885 100644 --- a/start.d/internal_dns.sh +++ b/start.d/internal_dns.sh @@ -3,6 +3,12 @@ set -eo pipefail dns_container_id="$(docker ps | grep "$OVPN_DNS_CONTAINER_NAME_PATTERN" | awk '{ print $1 }' 2> /dev/null)" if [ "$dns_container_id" != "" ]; then - echo "Connecting network 'vpnet' to $dns_container_id" - docker network connect ${OVPN_COMPOSE_NAME}_ovpn-net "$dns_container_id" + echo "Found running DNS container $dns_container_id" + existing_network_name="$(docker inspect "$dns_container_id" | jq -r '.[0].NetworkSettings.Networks | keys | .[0] ')" + echo "Found network '$existing_network_name' connected to '$dns_container_id'" + vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}_openvpn-1" | awk '{ print $1 }' 2> /dev/null)" + echo "Connecting network '$existing_network_name' to $vpn_container_id" + docker network connect "$existing_network_name" "$vpn_container_id" + echo "Connecting network '${OVPN_COMPOSE_NAME}_ovpn-net' to $dns_container_id" + docker network connect "${OVPN_COMPOSE_NAME}_ovpn-net" "$dns_container_id" fi diff --git a/stop.d/internal_dns.sh b/stop.d/internal_dns.sh index 49e7cd6..5a1829d 100644 --- a/stop.d/internal_dns.sh +++ b/stop.d/internal_dns.sh @@ -3,6 +3,12 @@ set -eo pipefail dns_container_id="$(docker ps | grep "$OVPN_DNS_CONTAINER_NAME_PATTERN" | awk '{ print $1 }' 2> /dev/null)" if [ "$dns_container_id" != "" ]; then - echo "Disconnecting network 'vpnet' from $dns_container_id" - docker network disconnect ${OVPN_COMPOSE_NAME}_ovpn-net "$dns_container_id" + echo "Found running DNS container $dns_container_id" + existing_network_name="$(docker inspect "$dns_container_id" | jq -r '.[0].NetworkSettings.Networks | keys | .[0] ')" + echo "Found network '$existing_network_name' connected to '$dns_container_id'" + vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}_openvpn-1" | awk '{ print $1 }' 2> /dev/null)" + echo "Disconnecting network '$existing_network_name' to $vpn_container_id" + docker network disconnect "$existing_network_name" "$vpn_container_id" + echo "Disconnecting network '${OVPN_COMPOSE_NAME}_ovpn-net' to $dns_container_id" + docker network disconnect "${OVPN_COMPOSE_NAME}_ovpn-net" "$dns_container_id" fi