test
This commit is contained in:
parent
cdf582dbb1
commit
3efd69790d
|
@ -4,11 +4,11 @@ set -eo pipefail
|
||||||
dns_container_id="$(docker ps | grep "$OVPN_DNS_CONTAINER_NAME_PATTERN" | awk '{ print $1 }' 2> /dev/null)"
|
dns_container_id="$(docker ps | grep "$OVPN_DNS_CONTAINER_NAME_PATTERN" | awk '{ print $1 }' 2> /dev/null)"
|
||||||
if [ "$dns_container_id" != "" ]; then
|
if [ "$dns_container_id" != "" ]; then
|
||||||
echo "Found running DNS container $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] ')"
|
# 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'"
|
# echo "Found network '$existing_network_name' connected to '$dns_container_id'"
|
||||||
vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}" | grep "openvpn" | awk '{ print $1 }' 2> /dev/null)"
|
# vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}" | grep "openvpn" | awk '{ print $1 }' 2> /dev/null)"
|
||||||
echo "Connecting network '$existing_network_name' to $vpn_container_id"
|
# echo "Connecting network '$existing_network_name' to $vpn_container_id"
|
||||||
docker network connect "$existing_network_name" "$vpn_container_id"
|
# docker network connect "$existing_network_name" "$vpn_container_id"
|
||||||
echo "Connecting network '${OVPN_COMPOSE_NAME}' to $dns_container_id"
|
echo "Connecting network '${OVPN_COMPOSE_NAME}' to $dns_container_id"
|
||||||
docker network connect "${OVPN_COMPOSE_NAME}_ovpn-net" "$dns_container_id"
|
docker network connect "${OVPN_COMPOSE_NAME}_ovpn-net" "$dns_container_id"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -5,10 +5,10 @@ dns_container_id="$(docker ps | grep "$OVPN_DNS_CONTAINER_NAME_PATTERN" | awk '{
|
||||||
if [ "$dns_container_id" != "" ]; then
|
if [ "$dns_container_id" != "" ]; then
|
||||||
echo "Found running DNS container $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] ')"
|
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'"
|
# echo "Found network '$existing_network_name' connected to '$dns_container_id'"
|
||||||
vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}" | grep "openvpn" | awk '{ print $1 }' 2> /dev/null || true)"
|
# vpn_container_id="$(docker ps | grep "${OVPN_COMPOSE_NAME}" | grep "openvpn" | awk '{ print $1 }' 2> /dev/null || true)"
|
||||||
echo "Disconnecting network '$existing_network_name' to $vpn_container_id"
|
# echo "Disconnecting network '$existing_network_name' to $vpn_container_id"
|
||||||
docker network disconnect "$existing_network_name" "$vpn_container_id" || true
|
# docker network disconnect "$existing_network_name" "$vpn_container_id" || true
|
||||||
echo "Disconnecting network '${OVPN_COMPOSE_NAME}_ovpn-net' to $dns_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" || true
|
docker network disconnect "${OVPN_COMPOSE_NAME}_ovpn-net" "$dns_container_id" || true
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue